From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 17 Sep 2003 18:30:23 +0000 (+0000)
Subject: Port gnulib-tool to Solaris 8.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f19e314ddcd59c9d51dae85c0fedbae710c5a141;p=pspp

Port gnulib-tool to Solaris 8.
---

diff --git a/ChangeLog b/ChangeLog
index 69dfd7d513..a27e06f182 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-17  Paul Eggert  <eggert@twinsun.com>
+
+	* gnulib-tool: Use "test -h", not "test -L", for portability
+	to Solaris 8 /bin/sh.  (This bug is fixed in Solaris 9.)
+	(tags_regexp): Remove, since \| doesn't conform to POSIX.
+	(sed_extract_prog): Issue s commands one-by-one, rather than
+	using \| in one s command.
+
 2003-09-16  Bruno Haible  <bruno@clisp.org>
 
 	* gnulib-tool (func_create_testdir): Warn about duplicated
diff --git a/gnulib-tool b/gnulib-tool
index 2cb4e02818..3a87d2fe13 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2003-09-16 14:53:35 $'
+cvsdatestamp='$Date: 2003-09-17 18:30:23 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -197,7 +197,7 @@ case "$0" in
      fi
      ;;
 esac
-while test -L "$self_abspathname"; do
+while test -h "$self_abspathname"; do
   # Resolve symbolic link.
   sedexpr1='s, -> ,#%%#,'
   sedexpr2='s,^.*#%%#\(.*\)$,\1,p'
@@ -231,11 +231,16 @@ func_verify_module ()
   fi
 }
 
-tags_regexp='\(Description\|Files\|Depends-on\|configure\.ac\|Makefile\.am\|Include\|Maintainer\)'
 sed_extract_prog=':[ 	]*$/ {
   :a
     n
-    s/^'"$tags_regexp"':[ 	]*$//
+    s/^Description:[ 	]*$//
+    s/^Files:[ 	]*$//
+    s/^Depends-on:[ 	]*$//
+    s/^configure\.ac:[ 	]*$//
+    s/^Makefile\.am:[ 	]*$//
+    s/^Include:[ 	]*$//
+    s/^Maintainer:[ 	]*$//
     tb
     p
     ba