[PATCH 5/6] UBUNTU: [Config] Fix build system for new config split

[Amit Kucheria]

Build system needs to know about the common config, arch-common config
and flavour configs

Signed-off-by: Amit Kucheria <amit.kucheria at canonical.com>
---
 debian/rules.d/0-common-vars.mk |    5 +++--
 debian/rules.d/2-binary-arch.mk |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 2ef4d0d..f392d96 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -66,7 +66,8 @@ SUBLEVEL	:= $(shell echo $(release) | awk -F. '{print $$3}')
 arch		:= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 abidir		:= $(CURDIR)/debian/abi/$(release)-$(revision)/$(arch)
 prev_abidir	:= $(CURDIR)/debian/abi/$(release)-$(prev_revision)/$(arch)
-confdir		:= $(CURDIR)/debian/config/$(arch)
+commonconfdir	:= $(CURDIR)/debian/config
+archconfdir	:= $(CURDIR)/debian/config/$(arch)
 builddir	:= $(CURDIR)/debian/build
 stampdir	:= $(CURDIR)/debian/stamps
 
@@ -98,7 +99,7 @@ conc_level		= -j$(CONCURRENCY_LEVEL)
 kmake = make ARCH=$(build_arch) \
 	EXTRAVERSION=-$(abinum)-$(target_flavour) \
 	CONFIG_DEBUG_SECTION_MISMATCH=y SUBLEVEL=$(SUBLEVEL) \
- 	KBUILD_BUILD_VERSION="$(uploadnum)"
+	KBUILD_BUILD_VERSION="$(uploadnum)"
 ifneq ($(LOCAL_ENV_CC),)
 kmake += CC=$(LOCAL_ENV_CC) DISTCC_HOSTS=$(LOCAL_ENV_DISTCC_HOSTS)
 endif
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index ab8d726..8083f00 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -6,7 +6,7 @@
 prepare-%: $(stampdir)/stamp-prepare-%
 	@# Empty for make to be happy
 $(stampdir)/stamp-prepare-%: target_flavour = $*
-$(stampdir)/stamp-prepare-%: $(confdir)/config $(confdir)/config.%
+$(stampdir)/stamp-prepare-%: $(commonconfdir)/config.common.ubuntu $(archconfdir)/config.common.$(arch) $(archconfdir)/config.flavour.%
 	@echo "Preparing $*..."
 	install -d $(builddir)/build-$*
 	touch $(builddir)/build-$*/ubuntu-build
-- 
1.6.3.1