doc tweak re target dependencies

[debhelper.git] / dh

diff --git a/dh b/dh
index 130d647ead2207734627eadf5859899f9a63614b..bf9685d7f9a53a6f21e16f3e6947d1501b9b1bf4 100755 (executable)
--- a/dh
+++ b/dh
@@ -258,7 +258,7 @@ B<build-indep>.
 
 Note that in the example above, dh will arrange for "debian/rules build"
 to call your build-indep and build-arch targets. You do not need to
-explicitly define the dependencies in the rules file when using dh with
+explicitly define those dependencies in the rules file when using dh with
 compatibility level v9. This example would be more complicated with
 earlier compatibility levels.
 
@@ -335,7 +335,7 @@ my $sequence;
 if (! compat(7)) {
        # From v8, the sequence is the very first parameter.
        $sequence=shift @ARGV_orig;
-       if ($sequence=~/^-/) {
+       if (defined $sequence && $sequence=~/^-/) {
                error "Unknown sequence $sequence (options should not come before the sequence)";
        }
 }
@@ -373,9 +373,6 @@ my @bd = qw{
        dh_auto_build
        dh_auto_test
 };
-my @i_minimal = qw{
-       dh_testroot
-};
 my @i = qw{
        dh_testroot
        dh_prep
@@ -438,26 +435,10 @@ $sequences{'build-indep'} = [@bd];
 $sequences{'build-arch'} = [@bd];
 if (! compat(8)) {
        # From v9, sequences take standard rules targets into account.
-       if (rules_explicit_target('build-arch') ||
-           rules_explicit_target('build-indep')) {
-               # run sequences separately
-               $sequences{build} = [@bd_minimal, rules("build-arch"), rules("build-indep")];
-       }
-       else {
-               # run standard sequence (this is faster)
-               $sequences{build} = [@bd];
-       }
+       $sequences{build} = [@bd_minimal, rules("build-arch"), rules("build-indep")];
        $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")];
-       }
-       else {
-               # run standard sequence (this is faster)
-               $sequences{'install'} = [rules("build"), @i, rules("install-arch"), rules("install-indep")];
-       }
+       $sequences{'install'} = [rules("build"), rules("install-arch"), rules("install-indep"), @i];
        $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")];
@@ -843,7 +824,7 @@ sub rules_explicit_target {
                                                if (defined $current_target) {
                                                        if (/^#/) {
                                                                # Check if target has commands to execute
-                                                               if (/^#\s*commands to execute/) {
+                                                               if (/^#\s*(commands|recipe) to execute/) {
                                                                        $targets{$current_target} = 1;
                                                                }
                                                        }