From 2ecdb0d619aafb1e874360c5a2f5e4046ed7c209 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 13 Feb 2021 13:28:03 -0500 Subject: [PATCH] Ensure INSTALL is packaged. When Automake is run in foreign mode, the standard INSTALL file is not copied by automake --add-missing. As this file provides general usage instructions for the GNU build system, it is useful to have included in the package. Just copy the file manually when bootstrapping to make that happen. --- .gitignore | 1 + Makefile.am | 2 +- bootstrap | 10 ++++++++-- m4/gnulib-cache.m4 | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2a5a11d..561315d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .deps .dirstamp .libs +/INSTALL /aclocal.m4 /atconfig /autom4te.cache diff --git a/Makefile.am b/Makefile.am index 85ab589..e2c3fc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ DISTCLEANFILES = MOSTLYCLEANFILES = MAINTAINERCLEANFILES = EXTRA_LIBRARIES = -EXTRA_DIST = +EXTRA_DIST = INSTALL AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ -DLOCALEDIR=\"$(localedir)\" diff --git a/bootstrap b/bootstrap index 460094f..ea1324f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright © 2011-2012 Nick Bowler +# Copyright © 2011-2012, 2021 Nick Bowler # # Simple script to get started from a fresh git checkout. # @@ -20,6 +20,7 @@ die() { } : ${AUTORECONF=autoreconf} +: ${AUTOMAKE=automake} : ${GNULIB=gnulib} : ${GIT=git} : ${PERL=perl} @@ -38,4 +39,9 @@ $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \ # Punt some automake-generated files so that Gentoo's wrapper script doesn't # try to detect the automake version in use. rm -f Makefile.in aclocal.m4 -$AUTORECONF -fis +$AUTORECONF -fis || exit + +amdir=`$AUTOMAKE --print-libdir` +if test -f "$amdir/INSTALL"; then + ln -sf "$amdir/INSTALL" INSTALL +fi diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 925e6d2..3a94092 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -50,7 +50,7 @@ gl_LOCAL_DIR([]) gl_MODULES([ getopt-gnu - gettext + gettext-h gitlog-to-changelog hypot localcharset -- 2.43.0