Simon Josefsson wrote:
> OATH Toolkit fails with sh+py though... gnulib-cache.m4.
The only remaining difference in gnulib-cache.m4 now is:
$ diff -u oath-toolkit-sh/liboath/gl/m4/gnulib-cache.m4
oath-toolkit-py/liboath/gl/m4/gnulib-cache.m4
--- oath-toolkit-sh/liboath/gl/m4/gnulib-cache.m4 2024-03-15 22:40:08.515313262
+0100
+++ oath-toolkit-py/liboath/gl/m4/gnulib-cache.m4 2024-03-16 12:18:14.292479963
+0100
@@ -27,7 +27,8 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --local-dir=gl/override \
+# gnulib-tool --import \
+# --local-dir=gl/override \
# --lib=libgnu \
# --source-base=gl \
# --m4-base=gl/m4 \
Here the Python output is prettier. So, here is a patch to align
gnulib-tool.sh's output with gnulib-tool.py. It's a leftover from this patch,
which did not cover the --local-dir options:
2018-07-17 Paul Eggert <egg...@cs.ucla.edu>
gnulib-tool: limit line length for git send-email
2024-03-16 Bruno Haible <br...@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.
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"
