From 6e31814343d8564508e66d3de0585feb7e69bfd8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Jun 2011 16:03:19 -0400 Subject: remove calls to build-arch, install-arch, etc These calls are no-ops, unless explicit targets exist, and in that case later code rewrites the build and install sequences to include them. --- dh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'dh') diff --git a/dh b/dh index 11dfc948..fd137379 100755 --- a/dh +++ b/dh @@ -346,12 +346,9 @@ my @bd = (@bd_minimal, qw{ dh_auto_build dh_auto_test }); -# The build sequences will call 'debian/rules build-arch' and -# 'debian/rules build-indep' after running the standard sequence; -# these will typically be no-ops but this permits the standard targets -# to be customised by the user and still run as a side-effect of the -# build target. -$sequences{build} = [@bd, 'rules:build-arch', 'rules:build-indep']; +# rules:build-arch and rules:build-indep are not called by build, +# as an optimisation (code below will adjust this if explicit targets exist). +$sequences{build} = [@bd]; $sequences{'build-indep'} = [@bd]; $sequences{'build-arch'} = [@bd]; $sequences{clean} = [qw{ @@ -403,12 +400,10 @@ my @i = (@i_minimal, qw{ dh_compress dh_fixperms }); -# The install sequences will call 'debian/rules build' before running -# the standard sequence, and 'debian/rules install-arch' and -# 'debian/rules install-indep' after running the standard sequence; -# these will typically be no-ops but this permits the install-arch and -# install-indep targets to be customised by the user and still run as -# a side-effect of the install target. +# The install sequences will call rules:build before running +# the standard sequence. rules:install-arch and rules:install-indep +# are not called by install, as an optimisation (code below will adjust +# this if explicit targets exist). $sequences{'install'} = ['rules:build', @i, 'rules:install-arch', 'rules:install-indep']; $sequences{'install-indep'} = ['rules:build-indep', @i]; $sequences{'install-arch'} = ['rules:build-arch', @i]; -- cgit v1.2.3