[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-768-gedf2c19

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=edf2c191790d31a4359b0b380bef351547719ca3

The branch, master has been updated
       via  edf2c191790d31a4359b0b380bef351547719ca3 (commit)
       via  5bbf66bd78066dfe088a8405e6c1755c3a9ab2ba (commit)
       via  e78436cf58d37d8471da0101407ff71d4fdee901 (commit)
      from  25917d6ba3350de974f432498fa82febb10e9e11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit edf2c191790d31a4359b0b380bef351547719ca3
Merge: 25917d6 5bbf66b
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 16 12:50:09 2011 +0200

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    8 +++++++-
 lib/depcomp |    4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1464f06..e9f9968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-16  Jim Meyering  <address@hidden>
+
+       depcomp: correct invalid sed invocation
+       * lib/depcomp: Insert missing -e before '/:$/d'.
+       Otherwise, that use of sed would treat '/:$/d' as a file name.
+
 2011-04-14  Stefano Lattarini  <address@hidden>
 
        maintainer check: quote literal `$' in Makefile rule
@@ -4475,7 +4481,7 @@
 
 -----
 
-Copyright (C) 2010  Free Software Foundation, Inc.
+Copyright (C) 2010, 2011  Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification, are
 permitted provided the copyright notice and this notice are preserved.
diff --git a/lib/depcomp b/lib/depcomp
index 6149451..9825d56 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-04-11-10; # UTC
+scriptversion=2011-04-16.09; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 # 2011 Free Software Foundation, Inc.
@@ -170,7 +170,7 @@ gcc)
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" '/:$/d' \
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
       | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;


hooks/post-receive
-- 
GNU Automake