From 0f0da70a2718b6ce0d07f0fe59786cb0cb07e48c Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Tue, 5 Feb 2019 19:19:31 +0100 Subject: [PATCH] [441-make-distcheck-fails-on-fedora-29] Added a script to fix distdir for automake >= 1.16 --- configure.ac | 28 ++++++++++++++++++++++++++++ fix-distdir.sh | 12 ++++++++++++ 2 files changed, 40 insertions(+) create mode 100755 fix-distdir.sh diff --git a/configure.ac b/configure.ac index 126d9c6d08..c942e26d03 100644 --- 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 index 0000000000..b6b72dcfaf --- /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 + -- 2.47.2