summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-11-05 22:16:41 -0400
committerJoey Hess <joey@kitenet.net>2013-11-05 22:16:41 -0400
commite1cbf912e56aa6a0104fc47f21515eb5a7525302 (patch)
tree9aa611a71bba3556a0e923a8bd82a4e54096abae
parentce3dc2079ea7dc15d48af6548fb8a90670184b1b (diff)
Fix (horrible) make output parsing code to work with make 4.0. Closes: #728800 Thanks, Julien Pinon
-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 dcc5da8..2c68a83 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 ca6a50e..6eb8215 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 ]