remove internal rules:target stuff

[debhelper.git] / dh

diff --git a/dh b/dh
index 9c9a34323438e803078f1f542392878e06c64787..2eda3353fab9d0d969e5a243a78b98e9fe8b97c5 100755 (executable)
--- a/dh
+++ b/dh
@@ -346,9 +346,12 @@ if (! defined $sequence) {
 }
 # make -B causes the rules file to be run as a target.
 # Also support completly empty override targets.
-# Note: it's not safe to use rules_explicit_target before this check.
+# Note: it's not safe to use rules_explicit_target before this check,
+# since it causes dh to be run.
+my $dummy_target="debhelper-fail-me";
 if ($sequence eq 'debian/rules' ||
-    $sequence =~ /^override_dh_/) {
+    $sequence =~ /^override_dh_/ ||
+    $sequence eq $dummy_target) {
        exit 0;
 }
 
@@ -432,26 +435,26 @@ if (! compat(8)) {
        if (rules_explicit_target('build-arch') ||
            rules_explicit_target('build-indep')) {
                # run sequences separately
-               $sequences{build} = [@bd_minimal, 'rules:build-arch', 'rules:build-indep'];
+               $sequences{build} = [@bd_minimal, rules("build-arch"), rules("build-indep")];
        }
        else {
                # run standard sequence (this is faster)
                $sequences{build} = [@bd];
        }
-       $sequences{'install-indep'} = ['rules:build-indep', @i];
-       $sequences{'install-arch'} = ['rules:build-arch', @i];
+       $sequences{'install-indep'} = [rules("build-indep"), @i];
+       $sequences{'install-arch'} = [rules("build-arch"), @i];
        if (rules_explicit_target('install-arch') ||
            rules_explicit_target('install-indep')) {
                # run sequences separately
-               $sequences{'install'} = ['rules:build', @i_minimal, 'rules:install-arch', 'rules:install-indep'];
+               $sequences{'install'} = [rules("build"), @i_minimal, rules("install-arch"), rules("install-indep")];
        }
        else {
                # run standard sequence (this is faster)
-               $sequences{'install'} = ['rules:build', @i, 'rules:install-arch', 'rules:install-indep'];
+               $sequences{'install'} = [rules("build"), @i, rules("install-arch"), rules("install-indep")];
        }
-       $sequences{'binary-indep'} = ['rules:install-indep', @b];
-       $sequences{'binary-arch'} = ['rules:install-arch', @ba, @b];
-       $sequences{binary} = ['rules:install', 'rules:binary-arch', 'rules:binary-indep'];
+       $sequences{'binary-indep'} = [rules("install-indep"), @b];
+       $sequences{'binary-arch'} = [rules("install-arch"), @ba, @b];
+       $sequences{binary} = [rules("install"), rules("binary-arch"), rules("binary-indep")];
 }
 else {
        $sequences{build} = [@bd];
@@ -691,8 +694,6 @@ sub run {
        my $override_command;
        my $has_explicit_target = rules_explicit_target("override_".$command);
 
-       # If the command has a rules: prefix, run debian/rules with
-       # the remainder as the target.
        my $rules_target = rules_target($command);
        if (defined $rules_target) {
                # Don't pass DH_ environment variables, since this is
@@ -778,7 +779,7 @@ sub optimize_sequence {
        foreach my $command (@_) {
                my $rules_target=rules_target($command);
                if (defined $rules_target &&
-                   ! rules_explicit_target($rules_target)) {
+                   ! defined rules_explicit_target($rules_target)) {
                        # inline the sequence for this implicit target
                        $add->($_) foreach optimize_sequence(@{$sequences{$rules_target}});
                }
@@ -791,7 +792,7 @@ sub optimize_sequence {
 
 sub rules_target {
        my $command=shift;
-       if ($command =~ /^rules:(.*)/) {
+       if ($command =~ /^debian\/rules\s+(.*)/) {
                return $1
        }
        else {
@@ -799,6 +800,10 @@ sub rules_target {
        }
 }
 
+sub rules {
+       return "debian/rules ".@_;
+}
+
 {
 my %targets;
 my $rules_parsed;
@@ -814,7 +819,7 @@ sub rules_explicit_target {
                my $processing_targets = 0;
                my $not_a_target = 0;
                my $current_target;
-               open(MAKE, "LC_ALL=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
+               open(MAKE, "LC_ALL=C make -Rrnpsf debian/rules $dummy_target 2>/dev/null |");
                while (<MAKE>) {
                        if ($processing_targets) {
                                if (/^# Not a target:/) {