From 1518daaebd7aa722774791add9b8a0e00d72d8d9 Mon Sep 17 00:00:00 2001 From: Collin Funk 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 349c468b70..edbb860cb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-04-03 Collin Funk + + 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 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.39.5