# HG changeset patch # User Ralf Wildenhues # Date 1230586861 -3600 # Node ID d54e63808f25a96c285e3c00badb50916bf97645 # Parent 03e819eea554f962b5161be5675a83b7c3586661 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 diff --git a/ChangeLog b/ChangeLog --- 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 --- a/gnulib-tool +++ b/gnulib-tool @@ -3456,9 +3456,9 @@ 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