From 6978d206bfa14854cc3fc18b733968834ef8edac Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 16 Mar 2024 12:38:35 +0100 Subject: [PATCH] gnulib-tool.sh: Make --local-dir options in gnulib-cache.m4 look nicer. * gnulib-tool.sh (func_import): Append the --local-dir=... options through func_append_actionarg. --- ChangeLog | 6 ++++++ gnulib-tool.sh | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0769f4983e..269fe5f5ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-03-16 Bruno Haible + + gnulib-tool.sh: Make --local-dir options in gnulib-cache.m4 look nicer. + * gnulib-tool.sh (func_import): Append the --local-dir=... options + through func_append_actionarg. + 2024-03-16 Bruno Haible gnulib-tool.py: Don't lose the gl_LGPL value from gnulib-cache.m4. diff --git a/gnulib-tool.sh b/gnulib-tool.sh index 47ee378444..62039fb03b 100755 --- a/gnulib-tool.sh +++ b/gnulib-tool.sh @@ -5563,13 +5563,6 @@ s,^\(.................................................[^ ]*\) *, # Command-line invocation printed in a comment in generated gnulib-cache.m4. actioncmd="# gnulib-tool --import" - # Local helper. - func_append_local_dir () - { - func_append "$1" " --local-dir=$2" - } - func_path_foreach "$local_gnulib_path" func_append_local_dir actioncmd %dir% - # Break the action command log into multiple lines. # Emacs puts some gnulib-tool log lines in its source repository, and # git send-email rejects patch lines longer than 998 characters. @@ -5580,6 +5573,14 @@ s,^\(.................................................[^ ]*\) *, { func_append actioncmd " \\$nl# $1" } + + # Local helper. + func_append_actioncmd_local_dir () + { + func_append_actionarg "--local-dir=$1" + } + func_path_foreach "$local_gnulib_path" func_append_actioncmd_local_dir %dir% + func_append_actionarg "--lib=$libname" func_append_actionarg "--source-base=$sourcebase" func_append_actionarg "--m4-base=$m4base" -- 2.39.5