From: Akim Demaille <akim@epita.fr>
Date: Wed, 25 Oct 2000 10:25:15 +0000 (+0000)
Subject: * acgeneral.m4 (AC_SHELL_DIRNAME): The sed fall back was producing
X-Git-Tag: autoconf-2.50~525
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27366d34e525835d9908890b2e47fba423d7db0f;p=thirdparty%2Fautoconf.git

* acgeneral.m4 (AC_SHELL_DIRNAME): The sed fall back was producing
twice the output for it was not using `-n' and used `p'.  Remove
the latter.
---

diff --git a/ChangeLog b/ChangeLog
index b65884345..14155e0ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-25  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (AC_SHELL_DIRNAME): The sed fall back was producing
+	twice the output for it was not using `-n' and used `p'.  Remove
+	the latter.
+
 2000-10-25  Akim Demaille  <akim@epita.fr>
 
 	* acgeneral.m4 (_AC_INIT_PREPARE_FDS): Give some information on
diff --git a/acgeneral.m4 b/acgeneral.m4
index c9d6fb40d..684e54700 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -927,11 +927,11 @@ define([AC_SHELL_DIRNAME],
       X[]$1 : 'X\(/\)' \| \
       .   : '\(.\)' 2>/dev/null ||
 echo "X[]$1" |
-    sed ['/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/p; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/p; q; }
-  	  /^X\(\/\/\)$/{ s//\1/p; q; }
-  	  /^X\(\/\).*/{ s//\1/p; q; }
-  	  s/.*/./p; q']])
+    sed ['/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q']])
 
 
 ## --------------------------------------------------- ##
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index c9d6fb40d..684e54700 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -927,11 +927,11 @@ define([AC_SHELL_DIRNAME],
       X[]$1 : 'X\(/\)' \| \
       .   : '\(.\)' 2>/dev/null ||
 echo "X[]$1" |
-    sed ['/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/p; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/p; q; }
-  	  /^X\(\/\/\)$/{ s//\1/p; q; }
-  	  /^X\(\/\).*/{ s//\1/p; q; }
-  	  s/.*/./p; q']])
+    sed ['/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q']])
 
 
 ## --------------------------------------------------- ##