From 7ade1ecd14b6669fbbe325a7b3605225bf53c1b8 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 29 Dec 2008 22:41:01 +0100 Subject: [PATCH] work around Solaris 8 'join' bug * gnulib-tool (func_update_ignorelist): Use 'join - FILE' rather than 'join FILE -', for Solaris join. Signed-off-by: Ralf Wildenhues --- ChangeLog | 5 +++++ gnulib-tool | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 612fbfef5b..e64c5d4dce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-29 Ralf Wildenhues + + * gnulib-tool (func_update_ignorelist): Use 'join - FILE' + rather than 'join FILE -', for Solaris join. + 2008-12-29 Bruno Haible * m4/codeset.m4 (AM_LANGINFO_CODESET): More systematic m4 argument diff --git a/gnulib-tool b/gnulib-tool index bc3effb45c..391b6b6d22 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3456,9 +3456,9 @@ s,//*$,/,' sed -e "s|^$anchor||" < "$destdir/$dir$ignore" | LC_ALL=C sort > "$tmp"/ignore (func_reset_sigpipe echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \ - | LC_ALL=C join -v 2 "$tmp"/ignore - > "$tmp"/ignore-added + | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \ - | LC_ALL=C join -v 2 "$tmp"/ignore - > "$tmp"/ignore-removed + | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-removed ) if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then if $doit; then -- 2.30.2