Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-17 08:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnulib: update

Browse Source 
* bootstrap.conf: gnulib_mk is defined again by bootstrap.
This commit is contained in:
Akim Demaille
2018-08-12 11:19:55 +02:00
parent f9a6b34147
commit c8dc9a8f51
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bootstrap
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Print a version string. # Print a version string.
scriptversion=2018-05-27.20; # UTC scriptversion=2018-07-25.07; # UTC
# Bootstrap this package from checked-out sources. # Bootstrap this package from checked-out sources.
@@ -142,6 +142,9 @@ die() { warn_ "$@"; exit 1; }
# Configuration. # Configuration.
# Name of the Makefile.am
gnulib_mk=gnulib.mk
# List of gnulib modules needed. # List of gnulib modules needed.
gnulib_modules= gnulib_modules=
@@ -165,7 +168,7 @@ bootstrap_epilogue() { :; }
# options because the latest/%s directory and the .po files within are # options because the latest/%s directory and the .po files within are
# all symlinks. # all symlinks.
po_download_command_format=\ po_download_command_format=\
"rsync --delete --exclude '*.s1' -Lrtvz \ "rsync --include '*.po' --exclude '*' -Lrtvz \
'translationproject.org::tp/latest/%s/' '%s'" 'translationproject.org::tp/latest/%s/' '%s'"
# Fallback for downloading .po files (if rsync fails). # Fallback for downloading .po files (if rsync fails).
@@ -942,13 +945,13 @@ fi
if $use_gnulib; then if $use_gnulib; then
gnulib_tool_options="\ gnulib_tool_options="\
--no-changelog\ --no-changelog\
--aux-dir $build_aux\ --aux-dir=$build_aux\
--doc-base $doc_base\ --doc-base=$doc_base\
--lib $gnulib_name\ --lib=$gnulib_name\
--m4-base $m4_base/\ --m4-base=$m4_base/\
--source-base $source_base/\ --source-base=$source_base/\
--tests-base $tests_base\ --tests-base=$tests_base\
--local-dir $local_gl_dir\ --local-dir=$local_gl_dir\
$gnulib_tool_option_extras\ $gnulib_tool_option_extras\
" "
if test $use_libtool = 1; then if test $use_libtool = 1; then

2
bootstrap.conf
View File

@@ -81,7 +81,7 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
bootstrap_post_import_hook() bootstrap_post_import_hook()
{ {
# Massage lib/gnulib.mk before using it later in the bootstrapping process. # Massage lib/gnulib.mk before using it later in the bootstrapping process.
build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/gnulib.mk build-aux/prefix-gnulib-mk --lib-name="$gnulib_name" "lib/$gnulib_mk"
# Ensure that ChangeLog exists, for automake. # Ensure that ChangeLog exists, for automake.
test -f ChangeLog || touch ChangeLog test -f ChangeLog || touch ChangeLog

2
gnulib

Submodule gnulib updated: 0d45ec7c03...8635df0ac8

1
m4/.gitignore vendored
View File

@@ -46,7 +46,6 @@
/gnulib-common.m4 /gnulib-common.m4
/gnulib-comp.m4 /gnulib-comp.m4
/gnulib-tool.m4 /gnulib-tool.m4
/hard-locale.m4
/iconv.m4 /iconv.m4
/include_next.m4 /include_next.m4
/intdiv0.m4 /intdiv0.m4