[debhelper-devel] [debhelper] 01/02: Fix (horrible) make output parsing code to work with make 4.0. Closes: #728800 Thanks, Julien Pinon

Joey Hess joey at kitenet.net
Wed Nov 6 02:27:12 UTC 2013


This is an automated email from the git hooks/post-receive script.

joeyh pushed a commit to branch master
in repository debhelper.

commit e1cbf912e56aa6a0104fc47f21515eb5a7525302
Author: Joey Hess <joey at kitenet.net>
Date:   Tue Nov 5 22:16:41 2013 -0400

    Fix (horrible) make output parsing code to work with make 4.0. Closes: #728800 Thanks, Julien Pinon
---
 Debian/Debhelper/Buildsystem/makefile.pm |    2 +-
 debian/changelog                         |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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 at debian.org>  Tue, 05 Nov 2013 22:15:59 -0400
+
 debhelper (9.20131104) unstable; urgency=low
 
   [ Joey Hess ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git




More information about the debhelper-devel mailing list