[debhelper-devel] Bug#734592: makefile.pm: make output parsing a bit less strict

[Andrew Shadura]

Package: debhelper
Version: 9.20131227
Severity: normal
Tags: patch

Hello,

I propose a patch to relax requirements to the make output. Currently,
when the target doesn't exist, makefile.pm expects string like:

make: *** No rule to make target 'clean'.  Stop.

However, if the Makefile includes autogenerated parts (as it is the case
with Jonathan Schleifer's buildsys.mk), make responds differently:

Makefile:4: buildsys.mk: No such file or directory
make: *** No rule to make target 'buildsys.mk'.  Stop.

Even if I change include to -include here, it won't really help as
'clean' target is defined in buildsys.mk which isn't yet generated, or
already removed by make distclean.

This is why I propose to remove check for the target name:

==> makefile.pm.diff <==
--- /usr/share/perl5/Debian/Debhelper/Buildsystem/makefile.pm
+++ /usr/share/perl5/Debian/Debhelper/Buildsystem/makefile.pm
@@ -61,7 +61,7 @@
 
 	return defined $output
 		&& length $output
-		&& $output !~ /\*\*\* No rule to make target (`|')\Q$target\E'/;
+		&& $output !~ /\*\*\* No rule to make target'/;
 }
 
 sub do_make {

Thanks.

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.9-1-686-pae (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/mksh

Versions of packages debhelper depends on:
ii  binutils    2.22-6
ii  dpkg        1.17.5
ii  dpkg-dev    1.17.1
ii  file        1:5.14-2
ii  man-db      2.6.0.2-2
ii  perl        5.18.1-4
ii  po-debconf  1.0.15

debhelper recommends no packages.

Versions of packages debhelper suggests:
ii  dh-make  0.59

-- no debconf information