From: Bruno Haible <bruno@clisp.org>
Date: Wed, 3 Apr 2024 23:26:48 +0000 (+0200)
Subject: gnulib-tool.sh: Reduce code duplication in last commit.
X-Git-Tag: v1.0~174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83a61464bd251ccd031ca3188d8be151f6591470;p=thirdparty%2Fgnulib.git

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 edbb860cb3..6863c5e20b 100644
--- 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 ecd9c5181c..57620ddf36 100755
--- 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