We can include the main bootstrapping scripts easily enough in the
package. If the user has a (possibly updated) Gnulib available, it
is now possible to regenerate the build system just by running the
included bootstrap script.
MOSTLYCLEANFILES =
MAINTAINERCLEANFILES =
EXTRA_LIBRARIES =
MOSTLYCLEANFILES =
MAINTAINERCLEANFILES =
EXTRA_LIBRARIES =
-EXTRA_DIST = INSTALL README.md
+EXTRA_DIST = bootstrap common/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
+ INSTALL README.md
AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-DLOCALEDIR=\"$(localedir)\"
AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-DLOCALEDIR=\"$(localedir)\"
+ * Include build system regeneration helper scripts.
* Fix NLS-related build problems.
Release 1:
* Fix NLS-related build problems.
Release 1:
- printf '%s: %s\n' "$scriptname" "$@" 1>&2
+ printf '%s: %s\n' "$scriptname" "$*" 1>&2
if test -x $GNULIB/gnulib-tool; then
$GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
else
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 \
fi
$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \