From: Joey Hess Date: Fri, 19 Feb 2010 17:57:27 +0000 (-0500) Subject: makefile buildsystem: Chomp output during test for full compatability with debhelper... X-Git-Tag: 7.4.16~10 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=064a1f6c7a3e3a224a319b214ed5aa7d552a9680;p=debhelper.git makefile buildsystem: Chomp output during test for full compatability with debhelper 7.4.11. Closes: #570503 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 e106ffd..d4b68e4 100644 --- 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=; + chomp $output; close MAKE; open(STDERR, ">&SAVEDERR"); return defined $output && length $output; diff --git a/debian/changelog b/debian/changelog index 94fd946..b45c52a 100644 --- 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 Thu, 18 Feb 2010 17:53:27 -0500