From 9a94235f8240020d777a420e4e134d21e428c263 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Wed, 19 Mar 2014 11:02:49 +0000
Subject: [PATCH] FS-6379: --resolve fix ldns bootstrap/build on solaris

---
 bootstrap.sh                   | 1 +
 libs/ldns/Makefile.in          | 2 +-
 libs/ldns/drill/Makefile.in    | 2 +-
 libs/ldns/examples/Makefile.in | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 349a9e5dac..ded4e85ba3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -432,6 +432,7 @@ bootstrap_libs_post() {
       if test ! -x install-sh; then
         ex ${AUTOMAKE:-automake} --add-missing --copy
         ex rm -rf autom4te*.cache
+        chmod a+x install-sh
       fi
       ;;
   esac
diff --git a/libs/ldns/Makefile.in b/libs/ldns/Makefile.in
index 6e0ce40641..19b51b1413 100644
--- a/libs/ldns/Makefile.in
+++ b/libs/ldns/Makefile.in
@@ -66,7 +66,7 @@ LINTFLAGS+="-Dsigset_t=long"
 # FreeBSD8
 LINTFLAGS+="-D__uint16_t=uint16_t"
 
-INSTALL = $(srcdir)/install-sh 
+INSTALL = $(SHELL) $(srcdir)/install-sh 
 
 LIBDNS_SOURCES	=	rdata.c util.c rr.c packet.c wire2host.c \
 			host2str.c buffer.c str2host.c tsig.c resolver.c \
diff --git a/libs/ldns/drill/Makefile.in b/libs/ldns/drill/Makefile.in
index 653cc51bce..66cb3efc51 100644
--- a/libs/ldns/drill/Makefile.in
+++ b/libs/ldns/drill/Makefile.in
@@ -15,7 +15,7 @@ CFLAGS = -I. @CFLAGS@
 CPPFLAGS = @CPPFLAGS@ 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-INSTALL = $(srcdir)/install-sh -c
+INSTALL = $(SHELL) $(srcdir)/install-sh -c
 INSTALL_PROGRAM = $(INSTALL)
 LDNSDIR = @LDNSDIR@
 LIBS_STC = @LIBS_STC@
diff --git a/libs/ldns/examples/Makefile.in b/libs/ldns/examples/Makefile.in
index 659efc0c33..a5258050b1 100644
--- a/libs/ldns/examples/Makefile.in
+++ b/libs/ldns/examples/Makefile.in
@@ -22,7 +22,7 @@ LIBS = @LIBS@
 RUNTIME_PATH = @RUNTIME_PATH@
 LDNSDIR = @LDNSDIR@
 
-INSTALL = $(srcdir)/../install-sh 
+INSTALL = $(SHELL) $(srcdir)/../install-sh 
 
 COMPILE         = $(CC) $(CPPFLAGS) $(LIBSSL_CPPFLAGS) $(CFLAGS)
 LINK		= $(libtool) --tag=CC --quiet --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) $(RUNTIME_PATH)