Mercurial > hg > octave-nkf > gnulib-hg
changeset 16293:8324ed8b219e
bootstrap: add bootstrap_post_import_hook
Bison does still need something like the gnulib_mk_hook whose
invocation I had to remove along with slurp in commit 767ccd40.
Technically, we could get along without it, but doing so would
have required living with a warning and a mandatory post-bootstrap
automake rerun.
* build-aux/bootstrap (gnulib_mk_hook): Remove definition, too.
(bootstrap_post_import_hook): New function.
Invoke it after gnulib-tool --import and before autoreconf.
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Thu, 19 Jan 2012 06:14:31 +0100 |
parents | a1210916671b |
children | f48c1a8db579 |
files | ChangeLog build-aux/bootstrap |
diffstat | 2 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-01-19 Jim Meyering <meyering@redhat.com> + + bootstrap: add bootstrap_post_import_hook + Bison does still need something like the gnulib_mk_hook whose + invocation I had to remove along with slurp in commit 767ccd40. + Technically, we could get along without it, but doing so would + have required living with a warning and a mandatory post-bootstrap + automake rerun. + * build-aux/bootstrap (gnulib_mk_hook): Remove definition, too. + (bootstrap_post_import_hook): New function. + Invoke it after gnulib-tool --import and before autoreconf. + 2012-01-18 Jim Meyering <meyering@redhat.com> gitlog-to-changelog: don't use "no_"-prefixed variable name
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-01-16.20; # UTC +scriptversion=2012-01-18.21; # UTC # Bootstrap this package from checked-out sources. @@ -87,9 +87,9 @@ : ${AUTOPOINT=autopoint} : ${AUTORECONF=autoreconf} -# A function to be called to edit gnulib.mk right after it's created. +# A function to be called right after gnulib-tool is run. # Override it via your own definition in bootstrap.conf. -gnulib_mk_hook() { :; } +bootstrap_post_import_hook() { :; } # A function to be called after everything else in this script. # Override it via your own definition in bootstrap.conf. @@ -807,6 +807,8 @@ symlink_to_dir "$GNULIB_SRCDIR" $file || exit done +bootstrap_post_import_hook + # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. # The following requires GNU find 4.2.3 or newer. Considering the usual