gnulib-tool.sh: Reduce code duplication in last commit.

* gnulib-tool.sh (func_get_automake_snippet_unconditional): Refactor
computation of sed_prepend_auxdir.

diff --git a/ChangeLog b/ChangeLog
index edbb860cb32e330b5c1314c08b22c204876fe596..6863c5e20ba531a6ed17320de0762f762d4435ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-04-03  Bruno Haible  <bruno@clisp.org>
+
+       gnulib-tool.sh: Reduce code duplication in last commit.
+       * gnulib-tool.sh (func_get_automake_snippet_unconditional): Refactor
+       computation of sed_prepend_auxdir.
+
 2024-04-03  Collin Funk  <collin.funk1@gmail.com>
 
        gnulib-tool.sh: Don't emit an unnecessary './' path component.

diff --git a/gnulib-tool.sh b/gnulib-tool.sh
index ecd9c5181c40f28d66324a3ac7048dc265cc9a4a..57620ddf36ec8851ddf635cf7ce390d64f07333b 100755 (executable)
--- a/gnulib-tool.sh
+++ b/gnulib-tool.sh
@@ -2654,10 +2654,11 @@ func_get_automake_snippet_unconditional ()
       func_filter_filelist buildaux_files "$nl" "$all_files" 'build-aux/' '' 'build-aux/' ''
       if test -n "$buildaux_files"; then
         if test "$auxdir" != "."; then
-          sed_prepend_auxdir='s,^,$(top_srcdir)/'"$auxdir"'/,'
+          auxdir_subdir="$auxdir/"
         else
-          sed_prepend_auxdir='s,^,$(top_srcdir)/,'
+          auxdir_subdir=
         fi
+        sed_prepend_auxdir='s,^,$(top_srcdir)/'"$auxdir_subdir"','
         echo "EXTRA_DIST += "`echo "$buildaux_files" | sed -e "$sed_prepend_auxdir"`
         echo
       fi