[441-make-distcheck-fails-on-fedora-29] Added a script to fix distdir for automake...

diff --git a/configure.ac b/configure.ac
index 126d9c6d0892aff4d6fd16081e85e15072a79ac9..c942e26d03cd7bb03f4749cb570a6f8e486f4778 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1706,6 +1706,34 @@ AC_CONFIG_COMMANDS([permissions], [
            chmod +x src/lib/util/python/gen_wiredata.py
            chmod +x src/lib/util/tests/process_spawn_app.sh
            chmod +x tools/path_replacer.sh
+           chmod +x fix-distdir.sh
+])
+
+AC_CONFIG_COMMANDS([fix-distdir], [
+           $srcdir/fix-distdir.sh src/bin/agent/Makefile
+           $srcdir/fix-distdir.sh src/bin/d2/Makefile
+           $srcdir/fix-distdir.sh src/bin/dhcp4/Makefile
+           $srcdir/fix-distdir.sh src/bin/dhcp6/Makefile
+           $srcdir/fix-distdir.sh src/bin/keactrl/Makefile
+           $srcdir/fix-distdir.sh src/bin/lfc/Makefile
+           $srcdir/fix-distdir.sh src/bin/netconf/Makefile
+           $srcdir/fix-distdir.sh src/hooks/dhcp/high_availability/Makefile
+           $srcdir/fix-distdir.sh src/hooks/dhcp/lease_cmds/Makefile
+           $srcdir/fix-distdir.sh src/hooks/dhcp/mysql_cb/Makefile
+           $srcdir/fix-distdir.sh src/hooks/dhcp/stat_cmds/Makefile
+           $srcdir/fix-distdir.sh src/hooks/dhcp/user_chk/Makefile
+           $srcdir/fix-distdir.sh src/lib/asiodns/Makefile
+           $srcdir/fix-distdir.sh src/lib/cfgrpt/Makefile
+           $srcdir/fix-distdir.sh src/lib/config/Makefile
+           $srcdir/fix-distdir.sh src/lib/database/Makefile
+           $srcdir/fix-distdir.sh src/lib/dhcp_ddns/Makefile
+           $srcdir/fix-distdir.sh src/lib/dhcpsrv/Makefile
+           $srcdir/fix-distdir.sh src/lib/dns/Makefile
+           $srcdir/fix-distdir.sh src/lib/eval/Makefile
+           $srcdir/fix-distdir.sh src/lib/hooks/Makefile
+           $srcdir/fix-distdir.sh src/lib/http/Makefile
+           $srcdir/fix-distdir.sh src/lib/log/tests/Makefile
+           $srcdir/fix-distdir.sh src/lib/process/Makefile
 ])
 
 AC_OUTPUT

diff --git a/fix-distdir.sh b/fix-distdir.sh
new file mode 100755 (executable)
index 0000000..b6b72dc
--- /dev/null
+++ b/fix-distdir.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# Removed the dependency of the distdir target on BUILT_SOURCES
+# This is added by automake >= 1.16 but makes dist* targets to
+# require prior build of the message compiler
+
+if grep -q 'distdir: $(BUILT_SOURCES)' $1 ; then
+   sed 's/distdir: $(BUILT_SOURCES)/distdir:/' < $1 > /tmp/fix-distdir-temp
+    mv /tmp/fix-distdir-temp $1
+fi
+exit 0
+