bootstrap: squawk if genver fails. Use -f with cp in case Dave does a chown

bk: 4745f6b5QDCU88XTMhq_MjjdC-2BKw

diff --git a/ChangeLog b/ChangeLog
index 04804c63038ee31739e767f37214cd37ef2eecc7..e021caf70ac8faf8bb9b0ae61408520583b92ce7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* bootstrap: squawk if genver fails.  Use -f with cp in case Dave does a chown.
 * Remove obsolete simulator command-line options.
 * ntp_request.c: [CID 36] zero sin_zero.
 * [Bug 963] get_systime() is too noisy.

diff --git a/bootstrap b/bootstrap
index feea0caafba3cb65390b5431359079a78e2a9ce3..29cb5d4db01a9d097234fcfb515c72bcf8d78274 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -27,7 +27,7 @@
 
 set -e
 
-scripts/genver
+scripts/genver || { echo scripts/genver failed ; exit 1; }
 
 # autoreconf says:
 # The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, ACLOCAL,
@@ -80,7 +80,7 @@ prog_opt_files=`grep -l '^prog.name' $def_files`
 
 for i in autogen-version.def version.def
 do
-    cmp -s include/$i sntp/$i || cp -p include/$i sntp/$i
+    cmp -s include/$i sntp/$i || cp -fp include/$i sntp/$i
 done
 
 # touch the stuff generated by the opt files