]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.sh: Make --local-dir options in gnulib-cache.m4 look nicer.
authorBruno Haible <bruno@clisp.org>
Sat, 16 Mar 2024 11:38:35 +0000 (12:38 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 16 Mar 2024 11:38:35 +0000 (12:38 +0100)
* gnulib-tool.sh (func_import): Append the --local-dir=... options
through func_append_actionarg.

ChangeLog
gnulib-tool.sh

index 0769f4983eeb8c522f25e1af5c4484268f8504ac..269fe5f5ffa70453cb0c9fe747cb689a272e733d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-16  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        gnulib-tool.py: Don't lose the gl_LGPL value from gnulib-cache.m4.
index 47ee378444e48b022f8504c070b4b4a457b9b2c8..62039fb03bbce7a4db2cfe8bf982582b035cb8fc 100755 (executable)
@@ -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"