debian/rules.real: Rename build-arch and setup-flavour rules for consistency

This commit is contained in:
Ben Hutchings 2016-03-20 21:51:13 +00:00
parent eaff86e9e2
commit d7b31e0e23
2 changed files with 4 additions and 4 deletions

View File

@ -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)

4
debian/rules.real vendored
View File

@ -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)