Correct docs about multiarch and v9. Closes: #630826

[debhelper.git] / dh

diff --git a/dh b/dh
index 59d5ee071fd6b6be4ef5428661f57928ff73f99f..aba8c270efb29d8bc9c4ebbcec67e14775d63b58 100755 (executable)
--- a/dh
+++ b/dh
@@ -278,6 +278,9 @@ options can override this behavior.
 A sequence can also run dependent targets in debian/rules.  For
 example, the "binary" sequence runs the "install" target.
 
+B<dh> sets environment variables listed by B<dpkg-buildflags>, unless
+they are already set. It supports DEB_BUILD_OPTIONS=noopt too.
+
 B<dh> uses the B<DH_INTERNAL_OPTIONS> environment variable to pass information
 through to debhelper commands that are run inside override targets. The
 contents (and indeed, existence) of this environment variable, as the name
@@ -315,7 +318,7 @@ init(options => {
        bundling => 0,
 );
 inhibit_log();
-
+set_buildflags();
 
 # If make is using a jobserver, but it is not available
 # to this process, clean out MAKEFLAGS. This avoids
@@ -435,26 +438,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];
@@ -694,8 +697,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
@@ -794,7 +795,7 @@ sub optimize_sequence {
 
 sub rules_target {
        my $command=shift;
-       if ($command =~ /^rules:(.*)/) {
+       if ($command =~ /^debian\/rules\s+(.*)/) {
                return $1
        }
        else {
@@ -802,6 +803,10 @@ sub rules_target {
        }
 }
 
+sub rules {
+       return "debian/rules ".join(" ", @_);
+}
+
 {
 my %targets;
 my $rules_parsed;