Author: beatle
Date: 2006-10-14 11:42:59 -0400 (Sat, 14 Oct 2006)
New Revision: 3780
Added:
branches/experimental/mesa/configs/debian
branches/experimental/mesa/configs/debian-default
branches/experimental/mesa/configs/debian-dri
branches/experimental/mesa/configs/debian-dri-default
Removed:
branches/experimental/mesa/configs/debian
branches/experimental/mesa/configs/debian-dri
Modified:
branches/experimental/mesa/debian/rules
Log:
Move the debian/debian-dri configurations to debian-default/debian-dri-default
respectively, and use debian/debian-dri to choose an architecture specific
configuration.
Deleted: branches/experimental/mesa/configs/debian
===================================================================
--- branches/experimental/mesa/configs/debian 2006-10-14 15:34:47 UTC (rev
3779)
+++ branches/experimental/mesa/configs/debian 2006-10-14 15:42:59 UTC (rev
3780)
@@ -1,8 +0,0 @@
-include $(TOP)/configs/debian-common
-include $(TOP)/configs/linux
-
-CONFIG_NAME = debian
-
-override SRC_DIRS = mesa glu
-override PROGRAM_DIRS =
-
Added: branches/experimental/mesa/configs/debian
===================================================================
--- branches/experimental/mesa/configs/debian (rev 0)
+++ branches/experimental/mesa/configs/debian 2006-10-14 15:42:59 UTC (rev
3780)
@@ -0,0 +1,8 @@
+#DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq ($(wildcard $(TOP)/configs/debian-$(DEB_BUILD_ARCH)),)
+ include $(TOP)/configs/debian-$(DEB_BUILD_ARCH)
+else
+ include $(TOP)/configs/debian-any
+endif
+
Copied: branches/experimental/mesa/configs/debian-default (from rev 3776,
branches/experimental/mesa/configs/debian)
===================================================================
--- branches/experimental/mesa/configs/debian-default
(rev 0)
+++ branches/experimental/mesa/configs/debian-default 2006-10-14 15:42:59 UTC
(rev 3780)
@@ -0,0 +1,8 @@
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux
+
+CONFIG_NAME = debian
+
+override SRC_DIRS = mesa glu
+override PROGRAM_DIRS =
+
Deleted: branches/experimental/mesa/configs/debian-dri
===================================================================
--- branches/experimental/mesa/configs/debian-dri 2006-10-14 15:34:47 UTC
(rev 3779)
+++ branches/experimental/mesa/configs/debian-dri 2006-10-14 15:42:59 UTC
(rev 3780)
@@ -1,5 +0,0 @@
-include $(TOP)/configs/debian-dri-common
-include $(TOP)/configs/linux-dri
-
-CONFIG_NAME = debian-dri
-
Added: branches/experimental/mesa/configs/debian-dri
===================================================================
--- branches/experimental/mesa/configs/debian-dri
(rev 0)
+++ branches/experimental/mesa/configs/debian-dri 2006-10-14 15:42:59 UTC
(rev 3780)
@@ -0,0 +1,8 @@
+#DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+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
+
Copied: branches/experimental/mesa/configs/debian-dri-default (from rev 3774,
branches/experimental/mesa/configs/debian-dri)
===================================================================
--- branches/experimental/mesa/configs/debian-dri-default
(rev 0)
+++ branches/experimental/mesa/configs/debian-dri-default 2006-10-14
15:42:59 UTC (rev 3780)
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-dri-common
+include $(TOP)/configs/linux-dri
+
+CONFIG_NAME = debian-dri
+
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-14 15:34:47 UTC (rev
3779)
+++ branches/experimental/mesa/debian/rules 2006-10-14 15:42:59 UTC (rev
3780)
@@ -19,11 +19,12 @@
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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
