* 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 192df403465d1fcca1ee3391a9cb3b0fdca27be2..fd94a2fffdd1ca2c41706cb8ad4a9df5e144eb62 100644 (file)
--- 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 27cf6abc0dfff4de7d0100fe3d9be28881be0350..baad9ea5c22a387313eeedb3c3288c3d0efa945d 100644 (file)
--- 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.