From 6fbe9796bd7c04163a5fc1c24ce6dd5bd3036bb1 Mon Sep 17 00:00:00 2001 From: "J.T. Conklin" Date: Wed, 27 Apr 2011 08:23:53 -0700 Subject: [PATCH] Change gnulib-tool to support NetBSD's join For backwards compatibility, the 4.4BSD join used by NetBSD supports a "-a" option as if it was "-a 1 -a 2". Unfortunately, this was done in such a way that "-a 1" and "-a 2" need to be passed as "-a1" or "-a2". --- ChangeLog | 5 +++++ gnulib-tool | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 247d541df..21ce7d7fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-04-27 J.T. Conklin (tiny change) + + * gnulib-tool: change "join -a 2" to "join -a2", the latter is + required by the NetBSD (and perhaps other 4.4BSD derived) join. + 2011-04-27 Reuben Thomas and Eric Blake diff --git a/gnulib-tool b/gnulib-tool index 9461027fe..49221f022 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2522,7 +2522,7 @@ func_show_module_list () echo "Module list with included dependencies (indented):" echo "$specified_modules" | sed -e '/^$/d' -e 's/$/| /' > "$tmp"/specified-modules echo "$modules" | sed -e '/^$/d' \ - | LC_ALL=C join -t '|' -a 2 "$tmp"/specified-modules - \ + | LC_ALL=C join -t '|' -a2 "$tmp"/specified-modules - \ | sed -e 's/^\(.*\)|.*/|\1/' -e 's/^/ /' -e 's/^ |\(.*\)$/ '"${bold_on}"'\1'"${bold_off}"'/' } -- 2.11.0