The fix for #563557 caused some new trouble involving makefile that misbehave when...

diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index 2c14c15184b92bcd26301676a8e33648509b6cf9..e106ffd0c545339d2373446b3abc9d11ba2ea6b0 100644 (file)
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -19,7 +19,7 @@ sub exists_make_target {
        my $buildpath = $this->get_buildpath();
        unshift @opts, "-C", $buildpath if $buildpath ne ".";
        open(SAVEDERR, ">&STDERR");
-       close STDERR;
+       open(STDERR, ">/dev/null");
        open(MAKE, "-|", $this->{makecmd}, @opts, $target);
        my $output=<MAKE>;
        close MAKE;

diff --git a/debian/changelog b/debian/changelog
index 77f1844d502085e47457247f040151f5dfe66199..342f61aa2e7a9b013503b32c4bee371153ba7c83 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (7.4.15) UNRELEASED; urgency=low
+
+  * The fix for #563557 caused some new trouble involving makefile
+    that misbehave when stderr is closed. Reopen it to /dev/null
+    when testing for the existance of a makefile target. Closes: #570443 
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 18 Feb 2010 16:36:18 -0500
+
 debhelper (7.4.14) unstable; urgency=low
 
   * dh: Disable option bundling to avoid mis-parsing bundled options such