From: Scott James Remnant <scott@netsplit.com>
Date: Thu, 12 Feb 2004 19:22:28 +0000 (+0000)
Subject: * ltmain.in, libtoolize.in, commit, config/mailnotify: Remove
X-Git-Tag: release-1-9b~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b042a87d13d64fe9e122910506b320401c4148d5;p=thirdparty%2Flibtool.git

* ltmain.in, libtoolize.in, commit, config/mailnotify: Remove
$SED from definitions of $dirname and $basename and prefix each
use with it instead.  Some shells (zsh) treat the expansion as
a single command instead of a command with arguments.
---

diff --git a/ChangeLog b/ChangeLog
index afaa9b242..4c9bb9c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-12  Scott James Remnant  <scott@netsplit.com>
+
+	* ltmain.in, libtoolize.in, commit, config/mailnotify: Remove
+	$SED from definitions of $dirname and $basename and prefix each
+	use with it instead.  Some shells (zsh) treat the expansion as
+	a single command instead of a command with arguments.
+
 2004-02-12  Scott James Remnant  <scott@netsplit.com>
 
 	* config/mailnotify (func_sendmail): Look for sendmail in a
diff --git a/commit b/commit
index c57d5bfdc..2273a9f44 100755
--- a/commit
+++ b/commit
@@ -73,8 +73,8 @@
 : ${RM="rm -f"}
 : ${SED="sed"}
 
-dirname="$SED s,/[^/]*$,,"
-basename="$SED s,^.*/,,g"
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,g"
 
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
@@ -84,7 +84,7 @@ basename="$SED s,^.*/,,g"
 progpath="$0"
 
 # The name of this program:
-progname=`echo "$progpath" | $basename`
+progname=`echo "$progpath" | $SED $basename`
 PROGRAM=clcommit
 
 # Global variables:
diff --git a/config/mailnotify b/config/mailnotify
index a9b07d908..a6e9c638b 100755
--- a/config/mailnotify
+++ b/config/mailnotify
@@ -61,8 +61,8 @@
 : ${RM="rm -f"}
 : ${SED="sed"}
 
-dirname="$SED s,/[^/]*$,,"
-basename="$SED s,^.*/,,g"
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,g"
 
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
@@ -72,7 +72,7 @@ basename="$SED s,^.*/,,g"
 progpath="$0"
 
 # The name of this program:
-progname=`echo "$progpath" | $basename`
+progname=`echo "$progpath" | $SED $basename`
 PROGRAM=mailnotify
 
 # Global variables:
diff --git a/libtoolize.in b/libtoolize.in
index c94c58e8e..2aa173930 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -54,8 +54,8 @@
 : ${RM="rm -f"}
 : ${SED="@SED@"}
 
-dirname="$SED s,/[^/]*$,,"
-basename="$SED s,^.*/,,g"
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,g"
 
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
@@ -65,7 +65,7 @@ basename="$SED s,^.*/,,g"
 progpath="$0"
 
 # The name of this program:
-progname=`echo "$progpath" | $basename`
+progname=`echo "$progpath" | $SED $basename`
 PROGRAM=libtoolize
 
 # Global variables:
@@ -244,7 +244,7 @@ func_mkdir_p ()
     while test ! -d "$my_dir"; do
       my_dirs="$my_dir $my_dirs"
       case $my_dir in */*) ;; *) break ;; esac
-      my_dir=`echo "$my_dir" | $dirname`
+      my_dir=`echo "$my_dir" | $SED $dirname`
     done
    test ! -n "$my_dirs" || $MKDIR $my_dirs
 }
@@ -258,7 +258,7 @@ func_copy ()
     my_destfile="$2"
     my_return_status=1
 
-    func_mkdir_p `echo "$my_destfile" | "$dirname`
+    func_mkdir_p `echo "$my_destfile" | $SED $dirname`
 
     $RM "$my_destfile"
     if $opt_link && $LN_S "$my_srcfile" "$my_destfile"; then
diff --git a/ltmain.in b/ltmain.in
index 495044d8e..ffc7ef229 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -25,7 +25,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-basename="$SED s,^.*/,,g"
+basename="s,^.*/,,g"
 
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
@@ -35,7 +35,7 @@ basename="$SED s,^.*/,,g"
 progpath="$0"
 
 # The name of this program:
-progname=`echo "$progpath" | $basename`
+progname=`echo "$progpath" | $SED $basename`
 modename="$progname"
 
 # Global variables: