From: Dave Hart <hart@ntp.org>
Date: Tue, 23 Nov 2010 03:54:56 +0000 (+0000)
Subject: build:
X-Git-Tag: NTP_4_2_7P85~3^2~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c6a9ffe2bb67a654047815a1848377db100c4bd;p=thirdparty%2Fntp.git

build:
  Do not skip configure if it is newer than config.status

bk: 4ceb3b10nIMNv68McX6S2-ZnTABrcg
---

diff --git a/build b/build
index 33eb451e4..de4ea8131 100755
--- 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=$?