gnulib-tool.sh: Don't emit an unnecessary './' path component.

[Collin Funk]

I'm continuing to go through GNU packages and testing them with
GNULIB_TOOL_IMPL=sh+py.

Texinfo doesn't use the bootstrap script but the README-hacking file
is easy to follow:

    To update the gnulib files, get a checkout of gnulib in a separate
    directory, then run, say

       ../gnulib/gnulib-tool --add-import

    in your top-level Texinfo directory and

       ../../../../gnulib/gnulib-tool --add-import

    under tp/Texinfo/XS.  (gnulib-tool is in the gnulib source tree.)

The first one under the root directory works as expected. The second
under tp/Texinfo/XS fails with this diff:

--- /home/collin/.local/src/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.am        
2024-04-03 04:25:14.105131041 -0700
+++ 
/home/collin/.local/src/texinfo/tp/Texinfo/glpyemzDvH/gnulib/lib/Makefile.am    
    2024-04-03 04:25:02.276104588 -0700
@@ -318,7 +318,7 @@
 ## begin gnulib module havelib
 
 
-EXTRA_DIST += $(top_srcdir)/./config.rpath
+EXTRA_DIST += $(top_srcdir)/config.rpath
 
 ## end   gnulib module havelib

This patch fixes it by checking if "$auxdir" is ".". If so, then we
just prepend the file with '$(top_srcdir)/' instead of
'$(top_srcdir)/'"$auxdir".

Collin
From 6d066e3313e989e257589bd7522d3af2c4d5332e Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Wed, 3 Apr 2024 05:11:33 -0700
Subject: [PATCH] gnulib-tool.sh: Don't emit an unnecessary './' path
 component.

* gnulib-tool.sh (func_get_automake_snippet_unconditional): Only prefix
build-aux files with '$(top_srcdir)/' when $auxdir is the top level
directory.
---
 ChangeLog      | 7 +++++++
 gnulib-tool.sh | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 230e9c5925..0d1389b1a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-04-03  Collin Funk  <collin.fu...@gmail.com>
+
+	gnulib-tool.sh: Don't emit an unnecessary './' path component.
+	* gnulib-tool.sh (func_get_automake_snippet_unconditional): Only prefix
+	build-aux files with '$(top_srcdir)/' when $auxdir is the top level
+	directory.
+
 2024-04-03  Collin Funk  <collin.fu...@gmail.com>
 
 	gnulib-tool.py: Modernize class declarations to Python 3.
diff --git a/gnulib-tool.sh b/gnulib-tool.sh
index 197744d8ed..ecd9c5181c 100755
--- a/gnulib-tool.sh
+++ b/gnulib-tool.sh
@@ -2653,7 +2653,11 @@ func_get_automake_snippet_unconditional ()
       # Synthesize an EXTRA_DIST augmentation also for the files in build-aux/.
       func_filter_filelist buildaux_files "$nl" "$all_files" 'build-aux/' '' 'build-aux/' ''
       if test -n "$buildaux_files"; then
-        sed_prepend_auxdir='s,^,$(top_srcdir)/'"$auxdir"'/,'
+        if test "$auxdir" != "."; then
+          sed_prepend_auxdir='s,^,$(top_srcdir)/'"$auxdir"'/,'
+        else
+          sed_prepend_auxdir='s,^,$(top_srcdir)/,'
+        fi
         echo "EXTRA_DIST += "`echo "$buildaux_files" | sed -e "$sed_prepend_auxdir"`
         echo
       fi
-- 
2.44.0