From: Bruno Haible <bruno@clisp.org>
Date: Fri, 15 Oct 2004 15:46:41 +0000 (+0000)
Subject: Portability tweak.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84091cf3e23927f9dbbf4309a75fe348b8c42a3a;p=pspp

Portability tweak.
---

diff --git a/ChangeLog b/ChangeLog
index 92c625eb07..217601621b 100644
--- 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 9654c631f9..eb7d853fe8 100755
--- 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