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.

diff --git a/.gitignore b/.gitignore
index 2a5a11d8abbfc8058bf9b5474d56daf0882a63de..561315d3ccc1af143b4e21b591b526683e5c26bb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 .deps
 .dirstamp
 .libs
 .deps
 .dirstamp
 .libs

+/INSTALL

 /aclocal.m4
 /atconfig
 /autom4te.cache
 /aclocal.m4
 /atconfig
 /autom4te.cache

diff --git a/Makefile.am b/Makefile.am
index 85ab589d72a0c23ef6bfdd7b1741767b673a7f84..e2c3fc3fbd7c2389069136c52036ff44b9e1ea1a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ DISTCLEANFILES =
 MOSTLYCLEANFILES =
 MAINTAINERCLEANFILES =
 EXTRA_LIBRARIES =
 MOSTLYCLEANFILES =
 MAINTAINERCLEANFILES =
 EXTRA_LIBRARIES =

-EXTRA_DIST =
+EXTRA_DIST = INSTALL

 
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
               -DLOCALEDIR=\"$(localedir)\"
 
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
               -DLOCALEDIR=\"$(localedir)\"

diff --git a/bootstrap b/bootstrap
index 460094faeb31f30c414193311508dfc0ba666481..ea1324f161b247f8164e0a692a8c6b3f8253f718 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
 #!/bin/sh
 #

-# Copyright © 2011-2012 Nick Bowler
+# Copyright © 2011-2012, 2021 Nick Bowler

 #
 # Simple script to get started from a fresh git checkout.
 #
 #
 # Simple script to get started from a fresh git checkout.
 #


@@ -20,6 +20,7 @@ die() {
 }
 
 : ${AUTORECONF=autoreconf}
 }
 
 : ${AUTORECONF=autoreconf}

+: ${AUTOMAKE=automake}

 : ${GNULIB=gnulib}
 : ${GIT=git}
 : ${PERL=perl}
 : ${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
 # 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 925e6d2b4dec30d55b72463eccefc6c2dcd11905..3a940923f96df10c96dce4f840ffe8ef008a6636 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -50,7 +50,7 @@
 gl_LOCAL_DIR([])
 gl_MODULES([
   getopt-gnu
 gl_LOCAL_DIR([])
 gl_MODULES([
   getopt-gnu

-  gettext
+  gettext-h

   gitlog-to-changelog
   hypot
   localcharset
   gitlog-to-changelog
   hypot
   localcharset