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>

diff --git a/ChangeLog b/ChangeLog
index 612fbfef5b1635e5b09c2b5c352e032fb142fc54..e64c5d4dce7881bad6feb47b86625704c976bbb7 100644 (file)
--- 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

diff --git a/gnulib-tool b/gnulib-tool
index bc3effb45cfd3e6ee4220175d915a277efe179df..391b6b6d2253c43d17010c181f922b048989e25b 100755 (executable)
--- 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