Merge branch 'fix-depcomp' into maint

* fix-depcomp:
  depcomp: correct invalid sed invocation

diff --cc ChangeLog
index 4346a0c,7851493..7025877
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,9 +1,32 @@@
+ 2011-04-16  Jim Meyering  <meyering@redhat.com>
+ 
+       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  <stefano.lattarini@gmail.com>
 +
 +      maintainer check: quote literal `$' in Makefile rule
 +      * Makefile.am (sc_tests_PATH_SEPARATOR): Escape literal `$'
 +      character in double-quoted string.  Fix a bug in which the rule
 +      emitted an erroneously empty substring in its error message.
 +
 +2011-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      coverage: test for automake bug#8485 (known regression)
 +      * tests/yacc-dist-nobuild-subdir.test: New test.
 +      * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
 +
 +2011-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test defs: define default $distdir (help reducing duplication)
 +      * tests/defs.in ($distdir): New variable, might be used in
 +      testcases checking distribution-related features.
 +      * tests/pr9.test: Use it.
 +      * tests/subdir9.test: Likewise.
 +      * tests/vtexi3.test: Add comment explaining why we redefine
 +      $distdir in this test.
 +
  2011-04-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        depcomp: fix bugs in tests and in the depcomp script