makefile buildsystem: Chomp output during test for full compatability with debhelper...

Previously the test used make -s -n | head -n 1 and then chomped the
output. In the case of this bug, root-system's Makefile *always* outputs
something to stdout, even for targets that don't exist, before configure is
run. It accidentially worked before, since the first line it outputs
happens to be empty.

So bring back the chomp to retain compatability with this package that used
to work before, but the test only does the right thing for this package due
to sheer luck, really.

diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index e106ffd0c545339d2373446b3abc9d11ba2ea6b0..d4b68e4c1e2de7f943c6008021e249fc46b1ef66 100644 (file)
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -22,6 +22,7 @@ sub exists_make_target {
        open(STDERR, ">/dev/null");
        open(MAKE, "-|", $this->{makecmd}, @opts, $target);
        my $output=<MAKE>;
+       chomp $output;
        close MAKE;
        open(STDERR, ">&SAVEDERR");
        return defined $output && length $output;

diff --git a/debian/changelog b/debian/changelog
index 94fd9461f2bcf4cdb03c85435443589710410050..b45c52a93ebd024da641cde0ed4195133a3d5d35 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 debhelper (7.4.16) UNRELEASED; urgency=low
 
   * Updated French translation.
+  * makefile buildsystem: Chomp output during test for full compatability
+    with debhelper 7.4.11. Closes: #570503
 
  -- Joey Hess <joeyh@debian.org>  Thu, 18 Feb 2010 17:53:27 -0500