From d7b31e0e23ee143f13771fab6201b4932d48afbe Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 21:51:13 +0000 Subject: [PATCH] debian/rules.real: Rename build-arch and setup-flavour rules for consistency --- debian/bin/gencontrol.py | 4 ++-- debian/rules.real | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 54e256194..d59f9395e 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -448,8 +448,8 @@ class Gencontrol(Base): cmds_binary_arch.append( "$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join("-p%s" % i['Package'] for i in packages_dummy), makeflags)) - cmds_build = ["$(MAKE) -f debian/rules.real build-arch %s" % makeflags] - cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags] + cmds_build = ["$(MAKE) -f debian/rules.real build-arch-flavour %s" % makeflags] + cmds_setup = ["$(MAKE) -f debian/rules.real setup-arch-flavour %s" % makeflags] makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_binary_arch) makefile.add('build-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build) makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_setup) diff --git a/debian/rules.real b/debian/rules.real index d0498bdb9..85a7f1e9b 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -74,9 +74,9 @@ endif binary-indep: install-source binary-indep: install-support -build-arch: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) +build-arch-flavour: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) -setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR) +setup-arch-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR) source-featureset: $(STAMPS_DIR)/source_$(FEATURESET)