From: Bruno Haible Date: Sun, 24 Mar 2024 00:37:30 +0000 (+0100) Subject: gnulib-tool.sh: Use a default auxdir in --extract-automake-snippet. X-Git-Tag: v1.0~240 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=7139c23fb6ce83561ef5357db01aab24f9256994;p=gnulib.git gnulib-tool.sh: Use a default auxdir in --extract-automake-snippet. * gnulib-tool.sh (extract-automake-snippet): Set auxdir to 'build-aux' if it is not set. --- diff --git a/ChangeLog b/ChangeLog index c032a315f8..0f8f5bb121 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-03-23 Bruno Haible + + gnulib-tool.sh: Use a default auxdir in --extract-automake-snippet. + * gnulib-tool.sh (extract-automake-snippet): Set auxdir to 'build-aux' + if it is not set. + 2024-03-23 Bruno Haible gnulib-tool.py: Don't unnecessarily sort an EXTRA_DIST augmentation. diff --git a/gnulib-tool.sh b/gnulib-tool.sh index d3b1cc710d..ba9ee83e74 100755 --- a/gnulib-tool.sh +++ b/gnulib-tool.sh @@ -2579,6 +2579,7 @@ func_get_automake_snippet_conditional () # Input: # - local_gnulib_path from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules +# - auxdir directory relative to destdir where to place build aux files func_get_automake_snippet_unconditional () { case "$1" in @@ -2664,6 +2665,7 @@ func_get_automake_snippet_unconditional () # Input: # - local_gnulib_path from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules +# - auxdir directory relative to destdir where to place build aux files func_get_automake_snippet () { func_get_automake_snippet_conditional "$1" @@ -7573,6 +7575,7 @@ s/\([.*$]\)/[\1]/g' ;; extract-automake-snippet ) + test -n "$auxdir" || auxdir="build-aux" for module do func_verify_module