diff options
Diffstat (limited to 'dh_auto_test')
| -rwxr-xr-x | dh_auto_test | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/dh_auto_test b/dh_auto_test index 74a80e8c..cf6e58a2 100755 --- a/dh_auto_test +++ b/dh_auto_test @@ -42,11 +42,16 @@ or override the any standard parameters that dh_auto_test passes. init(); if (-e "Makefile" || -e "makefile" || -e "GNUmakefile") { + $ENV{MAKE}="make" unless exists $ENV{MAKE}; foreach my $target (qw{test check}) { - my $ret=system("make --question $target >/dev/null 2>&1"); - if ($ret == 0) { - doit(exists $ENV{MAKE} ? $ENV{MAKE} : "make", - $target, @{$dh{U_PARAMS}}); + # Make --question returns false if the target is + # up-to-date. But we still want to run the target in this + # case. So ceck if a target exists by seeing if make outputs + # "Making target". + my $ret=`LANG=C $ENV{MAKE} --question $target 2>/dev/null`; + chomp $ret; + if ($ret =~ /^Making \Q$target\E/m) { + doit($ENV{MAKE}, $target, @{$dh{U_PARAMS}}); last; } } |