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 dafb638b40ef72738f082bba85129dd26228942f..bd0dd922ef114f5cd5ba8ba0f3935d6bf9eb392d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 .dirstamp
 .libs
 /ABOUT-NLS
+/INSTALL
 /aclocal.m4
 /atconfig
 /atlocal

diff --git a/Makefile.am b/Makefile.am
index 6d2cc663917c2508ed704b9b8038a5165d8adc7c..3a6e3000ba7fc4e2e13e28728d43ae0c245f8464 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST = m4/gnulib-cache.m4 src/types.lst src/validtypes.sed \
        src/specs.lst src/namespecs.sed src/ordspecs.sed \
        src/errors.lst src/strtab.sed test/typegen.sh \
        src/parse.y src/parse.stamp src/scan.l src/scan.stamp \
-       COPYING.WTFPL2 README.md
+       COPYING.WTFPL2 README.md INSTALL
 
 dist_man_MANS = doc/man/cdecl99.1 doc/man/libcdecl.3
 

diff --git a/bootstrap b/bootstrap
index 460094faeb31f30c414193311508dfc0ba666481..5023d833c0f4e1140ca15afb96f008cf620ccfc5 100755 (executable)
--- 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.
 #
@@ -11,7 +11,7 @@
 scriptname=$0
 
 err() {
-       printf '%s: %s\n' "$scriptname" "$@" 1>&2
+       printf '%s: %s\n' "$scriptname" "$*" 1>&2
 }
 
 die() {
@@ -20,6 +20,7 @@ die() {
 }
 
 : ${AUTORECONF=autoreconf}
+: ${AUTOMAKE=automake}
 : ${GNULIB=gnulib}
 : ${GIT=git}
 : ${PERL=perl}
@@ -29,7 +30,19 @@ $GIT submodule update --init || err "Failed to update submodules from git."
 if test -x $GNULIB/gnulib-tool; then
        $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
 else
-       die "Gnulib sources are not properly installed in gnulib/."
+  err "Gnulib sources are not properly installed in $GNULIB/"
+  cat >&2 <<'EOF'
+
+To bootstrap this package using an external Gnulib, you can set the GNULIB
+environment variable to indicate the location of the Gnulib sources.
+EOF
+
+  test ! -f configure || cat >&2 <<'EOF'
+
+However, it seems this package is already bootstrapped.  It should not
+normally be necessary to run this script from a release tarball.
+EOF
+  exit 1
 fi
 
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
@@ -38,4 +51,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