Move the debian/debian-dri configurations to debian-default/debian-dri-default

respectively, and use debian/debian-dri to choose an architecture specific
configuration.

5 files changed, 28 insertions, 11 deletions

diff --git a/configs/debian b/configs/debian
index 0a50109402f..b1437e2f048 100644
--- a/configs/debian
+++ b/configs/debian
@@ -1,8 +1,8 @@
-include $(TOP)/configs/debian-common
-include $(TOP)/configs/linux
+#DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CONFIG_NAME = debian
-
-override SRC_DIRS = mesa glu
-override PROGRAM_DIRS =
+ifneq ($(wildcard $(TOP)/configs/debian-$(DEB_BUILD_ARCH)),)
+	include $(TOP)/configs/debian-$(DEB_BUILD_ARCH)
+else
+	include $(TOP)/configs/debian-any
+endif
 
diff --git a/configs/debian-default b/configs/debian-default
new file mode 100644
index 00000000000..0a50109402f
--- /dev/null
+++ b/configs/debian-default
@@ -0,0 +1,8 @@
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux
+
+CONFIG_NAME = debian
+
+override SRC_DIRS = mesa glu
+override PROGRAM_DIRS =
+
diff --git a/configs/debian-dri b/configs/debian-dri
index db8c74e68bb..57034200667 100644
--- a/configs/debian-dri
+++ b/configs/debian-dri
@@ -1,5 +1,8 @@
-include $(TOP)/configs/debian-dri-common
-include $(TOP)/configs/linux-dri
+#DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CONFIG_NAME = debian-dri
+ifneq ($(wildcard $(TOP)/configs/debian-dri-$(DEB_BUILD_ARCH)),)
+	include $(TOP)/configs/debian-dri-$(DEB_BUILD_ARCH)
+else
+	include $(TOP)/configs/debian-dri-any
+endif
 
diff --git a/configs/debian-dri-default b/configs/debian-dri-default
new file mode 100644
index 00000000000..db8c74e68bb
--- /dev/null
+++ b/configs/debian-dri-default
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-dri-common
+include $(TOP)/configs/linux-dri
+
+CONFIG_NAME = debian-dri
+
diff --git a/debian/rules b/debian/rules
index 093efc14a90..aa5299b36ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,12 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
 
+export DEB_BUILD_ARCH
+
 STAMPDIR = debian/stamp
 
 # build the following configurations