speling

[debhelper.git] / dh

diff --git a/dh b/dh
index dff7f25d4ae438b02e6f9358c380114b085c4b70..36130f84fa9db0e33dc20d527eb7d9afe6d0ac82 100755 (executable)
--- a/dh
+++ b/dh
@@ -87,16 +87,16 @@ commands work with no additional options.
 
 Often you'll want to pass an option to a specific debhelper command. The
 easy way to do with is by adding an override target for that command.
-       
+
        #!/usr/bin/make -f
        %:
                dh $@
-
+       
        override_dh_strip:
                dh_strip -Xfoo
-               
-       override_dh_installdocs:
-               dh_installdocs README TODO
+       
+       override_dh_auto_configure:
+               dh_auto_configure -- --with-foo --disable-bar
 
 Sometimes the automated L<dh_auto_configure(1)> and L<dh_auto_build(1)>
 can't guess what to do for a strange package. Here's how to avoid running
@@ -133,7 +133,7 @@ that automate it, like this.
                dh $@ --with autotools_dev
 
 Python tools are not run by dh by default, due to the continual change
-in that area. (Before compatability level v9, dh does run B<dh_pysupport>.)
+in that area. (Before compatibility level v9, dh does run B<dh_pysupport>.)
 Here is how to use B<dh_python2>.
 
        #!/usr/bin/make -f
@@ -268,7 +268,7 @@ matches, the last one in the sequence will be used.
 # Stash this away before init modifies it.
 my @ARGV_orig=@ARGV;
 
-if (compat(8)) {
+if (compat(8, 1)) {
        # python-support was enabled by default before v9.
        # (and comes first so python-central loads later and can disable it).
        unshift @ARGV, "--with=python-support";
@@ -726,6 +726,13 @@ sub run_override {
        return @rest if ! $has_explicit_target; # has empty override
        return @rest unless @todo; # has override, but no packages to act on
 
+       if (defined $override_type) {
+               # Ensure appropriate -a or -i option is passed when running
+               # an arch-specific override target.
+               my $opt=$override_type eq "arch" ? "-a" : "-i";
+               push @options, $opt unless grep { $_ eq $opt } @options;
+       }
+
        # This passes the options through to commands called
        # inside the target.
        $ENV{DH_INTERNAL_OPTIONS}=join("\x1e", @options);