diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-04-23 15:57:17 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-04-23 15:57:17 -0400 |
commit | bf2778d7ca2f11d3584ff1d49c15df1238062107 (patch) | |
tree | e7495182da6882740820259eff884adf098766af /dh_auto_install | |
parent | e55c32e8b1292342b443e204807460dc597bf939 (diff) |
new method to tell if a makefile contains a target
Diffstat (limited to 'dh_auto_install')
-rwxr-xr-x | dh_auto_install | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dh_auto_install b/dh_auto_install index b35810a3..be052e21 100755 --- a/dh_auto_install +++ b/dh_auto_install @@ -67,13 +67,11 @@ if (-e "Makefile" || -e "makefile" || -e "GNUmakefile") { push @params, "PREFIX=/usr"; } foreach my $target (qw{install}) { - # Make --question returns false if the target is - # up-to-date. But we still want to run the target in this - # case. So check if a target exists by seeing if make outputs - # "Making target". - my $ret=`LANG=C $ENV{MAKE} --question $target 2>/dev/null`; + # Use make -n to check to see if the target would do + # anything. There's no good way to test if a target exists. + my $ret=`$ENV{MAKE} -s -n $target 2>/dev/null`; chomp $ret; - if ($ret =~ /^Making \Q$target\E/m) { + if (length $ret) { doit($ENV{MAKE}, $target, @params, @{$dh{U_PARAMS}}); |