summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Buildsystem
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-02-19 12:57:27 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-02-19 12:57:27 -0500
commit064a1f6c7a3e3a224a319b214ed5aa7d552a9680 (patch)
tree0dfc9dde6956d64c40f680f64c74bd9bd0724c77 /Debian/Debhelper/Buildsystem
parentba834176ebd101ed971749f00deff800a970f4ab (diff)
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.
Diffstat (limited to 'Debian/Debhelper/Buildsystem')
-rw-r--r--Debian/Debhelper/Buildsystem/makefile.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index e106ffd0..d4b68e4c 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=<MAKE>;
+ chomp $output;
close MAKE;
open(STDERR, ">&SAVEDERR");
return defined $output && length $output;