diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-01-16 12:29:19 +0100 |
|---|---|---|
| committer | Akim Demaille <demaille@gostai.com> | 2012-01-23 13:33:00 +0100 |
| commit | ee7e9e3b6600b104ef92c31207e18a2c057d831c (patch) | |
| tree | 30a7471d8b1dfd36c9953cba549e027ad6465b76 /bootstrap.conf | |
| parent | 81c5003f91d828d9007eee3085b4c3859541c238 (diff) | |
| download | bison-ee7e9e3b6600b104ef92c31207e18a2c057d831c.tar.gz | |
build: manually update bootstrap from gnulib, and adapt
Updating to the latest bootstrap from gnulib involves more of a
change than usual, and updating to the latest gnulib would involve
its own set of challenges with the upcoming quoting changes, so
we update bootstrap manually and separately.
* bootstrap: Update from gnulib.
* lib/Makefile.am: Initialize more variables to empty, so that gnulib.mk
can append to them with "+=".
* bootstrap.conf (gnulib_mk_hook): Remove. No longer honored.
(gnulib_tool_option_extras): Generate gnulib.mk.
(cherry picked from commit 85ad742d4e94345d5ac07755f6722344cfd49603)
Conflicts:
Makefile.am
bootstrap.conf
etc/prefix-gnulib-mk
Diffstat (limited to 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 747968c0..0f8487bb 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -72,4 +72,4 @@ bootstrap_epilogue() # the bootstrap entry from the file .x-update-copyright, and add any # needed copyright years to the copyright statement in the bootstrap # script. -bootstrap_sync=true +# FIXME: temporary bootstrap_sync=true |