From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 19 Jun 2006 00:14:55 +0000 (-0400)
Subject: Bash might not be in /bin/bash (for bootstrap)
X-Git-Tag: NTP_4_2_3P5~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=099b13a1cf0dd7dba00db77cfb5057a39416cdef;p=thirdparty%2Fntp.git

Bash might not be in /bin/bash (for bootstrap)

bk: 4495ec7fvBaskSeG2DhTNVV9JSigag
---

diff --git a/bootstrap b/bootstrap
index d452a1655..530c7a156 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 
 #  This "bootstrap" script performs various pre-autoreconf actions
 #  that are required after pulling fresh sources from the repository.
@@ -61,8 +61,11 @@ done
 
 ${AUTORECONF} -i -v
 
-# HMS: 20060615: the next line seems to be needed to make sure
-# we get the correct srcdir path in sntp/libopts/Makefile.in
-rm -rf sntp/autom4te.cache
-
-(cd sntp && ${AUTORECONF} -f -i -v)
+# HMS: 20060618: Now that we use separate copies of libopts
+# we should only need the previous line.
+#
+## HMS: 20060615: the next line seems to be needed to make sure
+## we get the correct srcdir path in sntp/libopts/Makefile.in
+#rm -rf sntp/autom4te.cache
+#
+#(cd sntp && ${AUTORECONF} -f -i -v)