From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Fri, 23 Jan 2004 22:43:19 +0000 (+0000)
Subject: * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Use `s/xx//p'
X-Git-Tag: Release-1-8b~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f060afe17cf3fe838d4c19cb1ae9534bd97a92d5;p=thirdparty%2Fautomake.git

* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Use `s/xx//p'
instead of `/xx/ s///p'; the latter fails when GNU sed is run with
POSIXLY_CORRECT.  Also strip superfluous -e.
Report from Miloslav Trmac.
---

diff --git a/ChangeLog b/ChangeLog
index 192df4034..fd94a2fff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-23  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Use `s/xx//p'
+	instead of `/xx/ s///p'; the latter fails when GNU sed is run with
+	POSIXLY_CORRECT.  Also strip superfluous -e.
+	Report from Miloslav Trmac.
+
 2004-01-22  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* tests/lex5.test: Sleep before calling AUTOMAKE the second time,
diff --git a/m4/depout.m4 b/m4/depout.m4
index 27cf6abc0..baad9ea5c 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -39,18 +39,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   fi
   # Extract the definition of DEPDIR, am__include, and am__quote
   # from the Makefile without running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
-  am__include=`sed -n -e '/^am__include = / s///p' < "$mf"`
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
   test -z "am__include" && continue
-  am__quote=`sed -n -e '/^am__quote = / s///p' < "$mf"`
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  U=`sed -n 's/^U = //p' < "$mf"`
   # Find all dependency output files, they are included files with
   # $(DEPDIR) in their names.  We invoke sed twice because it is the
   # simplest approach to changing $(DEPDIR) to its actual value in the
   # expansion.
-  for file in `sed -n -e "
+  for file in `sed -n "
     s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.