FS-6379: --resolve fix ldns bootstrap/build on solaris

diff --git a/bootstrap.sh b/bootstrap.sh
index 349a9e5dacc66cbdf15a73d9ea4919299498d0c8..ded4e85ba36144d5e88589dabc528af540a4e66e 100755 (executable)
--- 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 6e0ce40641bc241be67975611e7fcb076f38cc89..19b51b14135a1fb71d746de3023f8286d8c3ff2a 100644 (file)
--- 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 653cc51bceda3345bec6dedf1ef83b398ae74adb..66cb3efc51d9e9139f263b2d16943c722b8787f8 100644 (file)
--- 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 659efc0c33cc2fa7ec685a144d05170b5ae6b95c..a5258050b10927125a24be3a08e6a6ad7d5f1871 100644 (file)
--- 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)