[Bug 1321] build doesn't work if . isn't on $PATH.

bk: 4abfc9edp935Yp3iS4CTDUd_l4nrTg

diff --git a/ChangeLog b/ChangeLog
index 1ce2bde6846100194c78001077a04076fd6703d7..b04b299a6962e27b948ba34901a468991cb2db1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1321] build doesn't work if . isn't on $PATH.
 (4.2.5p222) 2009/09/27 Released by Harlan Stenn <stenn@ntp.org>
 * Update libisc code using bind-9.6.1-P1.tar.gz, rearrange our copy to
   mirror the upstream layout (lib/isc/...), and merge in NTP-local

diff --git a/build b/build
index 6451ec46350fb6bc0d258909b7fa0f1daf38bedd..fc2ba4c85de4f843033107f01b064ed2e2a1a8ca 100755 (executable)
--- a/build
+++ b/build
@@ -30,7 +30,12 @@ esac
 #set -e
 #set -x
 
-CVO=`./scripts/cvo.sh @cvo@`
+# scripts/cvo.sh invokes config.guess, and we want it to use the copy
+# in the top directory (alongside build) if there's not another
+# config.guess earlier on the path, so we invoke it using env to append
+# . to the PATH.
+
+CVO=`env PATH="$PATH:." scripts/cvo.sh @cvo@`
 case "$CVO" in
  *-*-*-*) "echo scripts/cvo.sh returned <$CVO>, which makes no sense to me."
     exit 1