Portability tweak.

diff --git a/ChangeLog b/ChangeLog
index 92c625eb0747d8e26a776535d9b0b0ab72282c3d..217601621bb005b1f21cf10f641e373eab5e1772 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,8 @@
        functions.
        (func_import): New function, extracted from big case statement. Use
        func_get_license, func_modules_transitive_closure,
-       func_modules_to_filelist. Initialize opt_lgpl.
+       func_modules_to_filelist. Initialize opt_lgpl. Don't use test -a, as
+       it's not portable.
        (func_create_testdir): Use func_modules_transitive_closure,
        func_modules_to_filelist.
 

diff --git a/gnulib-tool b/gnulib-tool
index 9654c631f969953a0980a8d5df19a0851c37a3ba..eb7d853fe858c5e25bd7d4a040d06f70bf4f59ff 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-10-15 15:43:58 $'
+cvsdatestamp='$Date: 2004-10-15 15:46:41 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -451,7 +451,7 @@ func_import ()
     test -n "$dry_run" && dry=echo
     $dry cp -p "$gnulib_dir/$f" "$destdir/$g"
     # Update license.
-    if test -z "$dry_run" -a -n "$lgpl" -a -n "$source"; then
+    if test -z "$dry_run" && test -n "$lgpl" && test -n "$source"; then
       perl -pi -e 's/GNU General/GNU Lesser General/g;' \
                -e 's/version 2([ ,])/version 2.1\1/g' \
                $destdir/$g