changeset 10980:d54e63808f25

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 <Ralf.Wildenhues@gmx.de>
author Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
date Mon, 29 Dec 2008 22:41:01 +0100
parents 03e819eea554
children 78dea9790e0f
files ChangeLog gnulib-tool
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* gnulib-tool (func_update_ignorelist): Use 'join - FILE'
+	rather than 'join FILE -', for Solaris join.
+
 2008-12-29  Bruno Haible  <bruno@clisp.org>
 
 	* m4/codeset.m4 (AM_LANGINFO_CODESET): More systematic m4 argument
--- 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