X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh;h=36130f84fa9db0e33dc20d527eb7d9afe6d0ac82;hb=4a692f55a0e9d9c579281f1c2002036436b2b367;hp=4eae44484842008b71dc50dfcdd0c0a7f97a2a1b;hpb=90adcc683565ff41b7d0bbf070589a157d8a26cd;p=debhelper.git

diff --git a/dh b/dh
index 4eae444..36130f8 100755
--- a/dh
+++ b/dh
@@ -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
@@ -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);