gnulib-tool.py: Use auxdir as given by AC_CONFIG_AUX_DIR.

[Collin Funk]

It seems that gettext catches a lot of issues with gnulib-tool.py...

The first patch addresses this:

diff -ru 
/home/collin/.local/src/gettext/gettext-runtime/gnulib-m4/gnulib-cache.m4 
/home/collin/.local/src/glpyVCpuH3/gettext-runtime/gnulib-m4/gnulib-cache.m4
--- /home/collin/.local/src/gettext/gettext-runtime/gnulib-m4/gnulib-cache.m4   
2024-04-06 05:23:27.471667282 -0700
+++ 
/home/collin/.local/src/glpyVCpuH3/gettext-runtime/gnulib-m4/gnulib-cache.m4    
    2024-04-06 06:06:28.102539887 -0700
@@ -34,7 +34,7 @@
 #  --m4-base=gnulib-m4 \
 #  --doc-base=doc \
 #  --tests-base=tests \
-#  --aux-dir=../build-aux \
+#  --aux-dir=build-aux \
 #  --no-conditional-dependencies \
 #  --no-libtool \
 #  --macro-prefix=gl \
Only in /home/collin/.local/src/glpyVCpuH3/gettext-runtime/gnulib-m4: 
gnulib-cache.m4~
diff -ru 
/home/collin/.local/src/gettext/gettext-runtime/gnulib-m4/gnulib-comp.m4 
/home/collin/.local/src/glpyVCpuH3/gettext-runtime/gnulib-m4/gnulib-comp.m4
--- /home/collin/.local/src/gettext/gettext-runtime/gnulib-m4/gnulib-comp.m4    
2024-04-06 05:23:29.262666548 -0700
+++ /home/collin/.local/src/glpyVCpuH3/gettext-runtime/gnulib-m4/gnulib-comp.m4 
2024-04-06 06:06:28.103539887 -0700
@@ -387,7 +387,7 @@
   gl_CONDITIONAL([GL_COND_OBJ_CLOSE], [test $REPLACE_CLOSE = 1])
   gl_UNISTD_MODULE_INDICATOR([close])
   AC_REQUIRE([gt_CSHARPCOMP])
-  AC_CONFIG_FILES([csharpcomp.sh:../build-aux/csharpcomp.sh.in])
+  AC_CONFIG_FILES([csharpcomp.sh:build-aux/csharpcomp.sh.in])

This is because gnulib-tool.py gets the auxdir from AC_CONFIG_AUX_DIR
with destdir. This seems to be incorrect based on the section of code
in gnulib-tool.sh starting at line 7275:

    if test -z "$auxdir"; then
      auxdir="$guessed_auxdir"
    fi

The second patch addresses this:

diff -ru /home/collin/.local/src/gettext/gettext-runtime/gnulib-lib/Makefile.am 
/home/collin/.local/src/glpyaGkFPQ/gettext-runtime/gnulib-lib/Makefile.am
--- /home/collin/.local/src/gettext/gettext-runtime/gnulib-lib/Makefile.am      
2024-04-06 05:23:34.728664307 -0700
+++ /home/collin/.local/src/glpyaGkFPQ/gettext-runtime/gnulib-lib/Makefile.am   
2024-04-06 06:13:24.432322731 -0700
@@ -379,7 +379,7 @@
 ## begin gnulib module csharpcomp-script
 
 
-EXTRA_DIST += $(top_srcdir)/../build-aux/csharpcomp.sh.in
+EXTRA_DIST += build-aux/csharpcomp.sh.in

Since joinpath() uses os.path.norm(), it will see '$(top_srcdir)/..'
and delete both path components. This is incorrect.

I've just wrapped that variable with os.path.join() for now which will
prevent it from being deleted. That function is starting to become
pretty annoying though. :(

Collin

0002-gnulib-tool.py-Use-auxdir-as-given-by-AC_CONFIG_AUX_.patch
Description: Text Data

0003-gnulib-tool.py-Don-t-allow-path-normalization-to-del.patch
Description: Text Data