- Fix for version generation race condition that ignored changes.

diff --git a/doc/Changelog b/doc/Changelog
index a7c9c40026e5fdb474147d7d9346639a8ef0f829..71df37ed145c605d614d19be32e00bdb51042df6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+28 August 2023: Wouter
+       - Fix for version generation race condition that ignored changes.
+
 25 August 2023: Wouter
        - Fix compile error on NetBSD in util/netevent.h.
 

diff --git a/makedist.sh b/makedist.sh
index 7fb69630ee4a082c85181c8be04d23a7f8dc31d4..e9dd1c3b3f5927f7e0f5bb6c1e92af50d7cdbdfb 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -358,8 +358,8 @@ if [ "$DOWIN" = "yes" ]; then
        replace_version "configure.ac" "$version" "$version2"
        version="$version2"
        info "Rebuilding configure script (autoconf) snapshot."
-       autoconf || error_cleanup "Autoconf failed."
-       autoheader || error_cleanup "Autoheader failed."
+       autoconf -f || error_cleanup "Autoconf failed."
+       autoheader -f || error_cleanup "Autoheader failed."
        rm -r autom4te* || echo "ignored"
     fi
 
@@ -511,7 +511,7 @@ if [ `uname -s | grep -i -c darwin` -ne 0 ]; then
 fi
 
 info "Building configure script (autoreconf)."
-autoreconf || error_cleanup "Autoconf failed."
+autoreconf -f || error_cleanup "Autoconf failed."
 
 rm -r autom4te* || error_cleanup "Failed to remove autoconf cache directory."
 
@@ -556,7 +556,7 @@ fi
 
 if [ "$RECONFIGURE" = "yes" ]; then
     info "Rebuilding configure script (autoconf) snapshot."
-    autoreconf || error_cleanup "Autoconf failed."
+    autoreconf -f || error_cleanup "Autoconf failed."
     rm -r autom4te* || error_cleanup "Failed to remove autoconf cache directory."
 fi