Mercurial > hg > octave-shane > gnulib-hg
changeset 14625:1a2352cb014f
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".
| author | J.T. Conklin <jtc@acorntoolworks.com> |
|---|---|
| date | Wed, 27 Apr 2011 08:23:53 -0700 |
| parents | e00c934ee25d |
| children | 0f3fba4a62b1 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-04-27 J.T. Conklin <jtc@acorntoolworks.com> (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 <rrt@sc3d.org> and Eric Blake <eblake@redhat.com>
--- a/gnulib-tool +++ b/gnulib-tool @@ -2522,7 +2522,7 @@ 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}"'/' }