summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Debian/Debhelper/Buildsystem/makefile.pm2
-rw-r--r--debian/changelog7
2 files changed, 8 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index dcc5da87..2c68a836 100644
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -61,7 +61,7 @@ sub exists_make_target {
return defined $output
&& length $output
- && $output !~ /\*\*\* No rule to make target `\Q$target\E'/;
+ && $output !~ /\*\*\* No rule to make target (`|')\Q$target\E'/;
}
sub do_make {
diff --git a/debian/changelog b/debian/changelog
index ca6a50ec..6eb82159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (9.20131105) UNRELEASED; urgency=low
+
+ * Fix (horrible) make output parsing code to work with make 4.0.
+ Closes: #728800 Thanks, Julien Pinon
+
+ -- Joey Hess <joeyh@debian.org> Tue, 05 Nov 2013 22:15:59 -0400
+
debhelper (9.20131104) unstable; urgency=low
[ Joey Hess ]