Make sure that build-aux/compile is in the tarball.
diff --git a/ChangeLog b/ChangeLog
index 6a274d2..2dbd9cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-08-30 Bruno Haible <bruno@clisp.org>
+
+ Make sure that build-aux/compile is in the tarball.
+ * autogen.sh: Fetch also 'build-aux/compile' through gnulib-tool.
+ * Makefile.devel (srclib/Makefile.in): Don't fetch nor delete
+ 'build-aux/compile'.
+ * Makefile.in (AUTOMAKE_IMPORTED_FILES): Remove build-aux/compile.
+ (IMPORTED_FILES): Add build-aux/compile.
+
2020-08-29 Bruno Haible <bruno@clisp.org>
Update after gnulib changed.
diff --git a/Makefile.devel b/Makefile.devel
index 4183025..2a5e101 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -81,11 +81,8 @@
fi
srclib/Makefile.in : srclib/Makefile.am srclib/Makefile.gnulib aclocal.m4
- if test -n "$$GNULIB_TOOL"; then \
- $$GNULIB_TOOL --copy-file build-aux/compile; \
- fi
# Make sure we get new versions of files brought in by automake.
- (cd build-aux && rm -f compile depcomp install-sh mdate-sh missing test-driver)
+ (cd build-aux && rm -f depcomp install-sh mdate-sh missing test-driver)
$(AUTOMAKE) --gnits --add-missing --copy srclib/Makefile && rm -rf autom4te.cache
diff --git a/Makefile.in b/Makefile.in
index 5d501ce..4e66be5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -184,7 +184,6 @@
AUTOMAKE_OLD_IMPORTED_FILES = \
build-aux/mkinstalldirs
AUTOMAKE_IMPORTED_FILES = \
- build-aux/compile \
build-aux/install-sh \
build-aux/missing
GNULIB_IMPORTED_FILES = \
@@ -198,6 +197,7 @@
IMPORTED_FILES = \
COPYING COPYING.LIB \
ABOUT-NLS INSTALL.generic \
+ build-aux/compile \
build-aux/ar-lib \
$(LIBTOOL_IMPORTED_FILES) $(AUTOMAKE_OLD_IMPORTED_FILES) $(AUTOMAKE_IMPORTED_FILES) $(GNULIB_IMPORTED_FILES)
# List of distributed files generated by autotools or Makefile.devel.
diff --git a/autogen.sh b/autogen.sh
index 03f7fc3..1ab9c37 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -57,8 +57,10 @@
echo "*** gnulib-tool not found." 1>&2
exit 1
}
- $GNULIB_TOOL --copy-file build-aux/ar-lib || exit $?
- chmod a+x build-aux/ar-lib || exit $?
+ for file in build-aux/compile build-aux/ar-lib; do
+ $GNULIB_TOOL --copy-file $file || exit $?
+ chmod a+x $file || exit $?
+ done
make -f Makefile.devel \
gnulib-clean srclib/Makefile.gnulib gnulib-imported-files srclib/Makefile.in \
GNULIB_TOOL="$GNULIB_TOOL"
