summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xbuild-aux/bootstrap5
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 80dc2c244c..6f0fb03e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-25 Jim Meyering <meyering@fb.com>
+
+ bootstrap: reinstate definition fo gnulib_mk.
+ That variable is used at least by cppi.
+ * build-aux/bootstrap (gnulib_mk): Restore definition.
+ This reverts the deletion from v0.1-1844-gc66dba9ba.
+
2018-07-23 Bruno Haible <bruno@clisp.org>
doc: For module names, use texinfo markup @code{} or @samp{}.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index ed3b0a4b70..6f74a02816 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2018-07-01.02; # UTC
+scriptversion=2018-07-25.07; # UTC
# Bootstrap this package from checked-out sources.
@@ -142,6 +142,9 @@ die() { warn_ "$@"; exit 1; }
# Configuration.
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
# List of gnulib modules needed.
gnulib_modules=