]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
build:
authorDave Hart <hart@ntp.org>
Tue, 23 Nov 2010 03:54:56 +0000 (03:54 +0000)
committerDave Hart <hart@ntp.org>
Tue, 23 Nov 2010 03:54:56 +0000 (03:54 +0000)
  Do not skip configure if it is newer than config.status

bk: 4ceb3b10nIMNv68McX6S2-ZnTABrcg

build

diff --git a/build b/build
index 33eb451e4fcda141b598cd69b7b229e1a74374e4..de4ea81314e794d16d426e2d68ba3dc47a0a79b4 100755 (executable)
--- a/build
+++ b/build
@@ -121,9 +121,13 @@ HEREDOC
 CONFIGURE="../configure --cache-file=../config.cache-$IAM$CCSUF $CONFIG_ARGS"
 
 (      # This sequence of commands is logged to make.log.
-       [ -f config.status ] || $NICEB -7 $CONFIGURE
-       $NICEB -5 ./config.status
-       $NICEB -14 ${MAKE-make} && $NICEB -10 ${MAKE-make} check
+       # Solaris /bin/sh doesn't grok -nt, csh does
+       csh -c '[ config.status -nt ../configure ] && \
+               [ sntp/config.status -nt ../sntp/configure ]' || \
+                        $NICEB -7 $CONFIGURE
+       $NICEB -5 ./config.status &&    \
+               ( cd sntp && $NICEB -5 ./config.status )
+       $NICEB -14 ${MAKE-make} && $NICEB -11 ${MAKE-make} check
 ) > $LOGF 2>&1
 
 EXITCODE=$?