X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh;h=27733accbaa17e67f011c8b0e92e2606b18f6c8d;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hp=8538024407dfa511d4a2faa0301c06bc53877aec;hpb=2d75be58ad42d56059c4fb4a267c7e0ca6b49e64;p=debhelper.git

diff --git a/dh b/dh
index 8538024..27733ac 100755
--- 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
@@ -123,14 +123,6 @@ after a particular debhelper command is run.
 		dh_fixperms
 		chmod 4755 debian/foo/usr/bin/foo
 
-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>.)
-Here is how to use B<dh_python2>.
-
-	#!/usr/bin/make -f
-	%:
-		dh $@ --with python2
-
 If your package uses autotools and you want to freshen F<config.sub> and
 F<config.guess> with newer versions from the B<autotools-dev> package
 at build time, you can use some commands provided in B<autotools-dev>
@@ -140,6 +132,14 @@ 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>.)
+Here is how to use B<dh_python2>.
+
+	#!/usr/bin/make -f
+	%:
+		dh $@ --with python2
+
 Here is how to force use of Perl's B<Module::Build> build system,
 which can be necessary if debhelper wrongly detects that the package
 uses MakeMaker.
@@ -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";
@@ -418,7 +418,7 @@ if (! compat(8)) {
 	$sequences{build} = [@bd_minimal, rules("build-arch"), rules("build-indep")];
 	$sequences{'install-indep'} = [rules("build-indep"), @i];
 	$sequences{'install-arch'} = [rules("build-arch"), @i];
-	$sequences{'install'} = [rules("build"), rules("install-arch"), rules("install-indep"), @i];
+	$sequences{'install'} = [rules("build"), 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")];
@@ -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);