gnulib-tool.sh: Use a default auxdir in --extract-automake-snippet

[Bruno Haible]

Here it's gnulib-tool.sh which produces bad output:

$ diff -u <(./gnulib-tool.sh --extract-automake-snippet relocatable-prog) 
<(./gnulib-tool.py --extract-automake-snippet relocatable-prog)
--- /dev/fd/63  2024-03-24 01:30:55.783950235 +0100
+++ /dev/fd/62  2024-03-24 01:30:55.783950235 +0100
@@ -22,5 +22,5 @@
 
 EXTRA_lib_SOURCES += relocatable.c
 
-EXTRA_DIST += $(top_srcdir)//config.libpath $(top_srcdir)//reloc-ldflags 
$(top_srcdir)//libtool-reloc
+EXTRA_DIST += $(top_srcdir)/build-aux/config.libpath 
$(top_srcdir)/build-aux/reloc-ldflags $(top_srcdir)/build-aux/libtool-reloc
 

This patch fixes it.


2024-03-23  Bruno Haible  <bruno@clisp.org>

        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/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