]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.sh: Don't emit an unnecessary './' path component.
authorCollin Funk <collin.funk1@gmail.com>
Wed, 3 Apr 2024 12:11:33 +0000 (05:11 -0700)
committerBruno Haible <bruno@clisp.org>
Wed, 3 Apr 2024 23:33:10 +0000 (01:33 +0200)
* gnulib-tool.sh (func_get_automake_snippet_unconditional): Only prefix
build-aux files with '$(top_srcdir)/' when $auxdir is the top level
directory.

ChangeLog
gnulib-tool.sh

index 349c468b704b2007d1728d6a3088653e7326561f..edbb860cb32e330b5c1314c08b22c204876fe596 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-04-03  Collin Funk  <collin.funk1@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.funk1@gmail.com>
 
        gnulib-tool.py: Modernize class declarations to Python 3.
index 197744d8eddf7d0688f65e0b8a29b6d585c1024c..ecd9c5181c40f28d66324a3ac7048dc265cc9a4a 100755 (executable)
@@ -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