Portability problem with Solaris sh.

diff --git a/ChangeLog b/ChangeLog
index dbb398e16240c13f434ffd0a846a9c7a1c79a2a9..c4d944e15d8cc40bcd92e56b7cc5c17708624405 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-25  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Use "trap :" instead of "trap -" to get
+       rid of a trap command. For Solaris sh.
+       Reported by Mark D. Baushke <mdb@gnu.org>.
+
 2006-01-24  Bruno Haible  <bruno@clisp.org>
 
        * modules/strnlen (Maintainer): Change from glibc to all.

diff --git a/gnulib-tool b/gnulib-tool
index 5aa7694dbf729b7b92340210b7555370642fc25b..9478017ba577e6ee95a77dce2ee85f6c6cd33ade 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-01-24 19:18:45 $'
+cvsdatestamp='$Date: 2006-01-25 14:20:06 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1176,7 +1176,7 @@ func_import ()
     func_add_or_update
   done
   rm -rf "$tmp"
-  trap - 0 1 2 3 15
+  trap : 0 1 2 3 15
 
   # Command-line invocation printed in a comment in generated gnulib-cache.m4.
   actioncmd="gnulib-tool --import"