diff options
| author | Thierry Reding <thierry@gilfi.de> | 2006-10-14 15:42:59 +0000 |
|---|---|---|
| committer | Thierry Reding <thierry@gilfi.de> | 2006-10-14 15:42:59 +0000 |
| commit | 32c7138d86f1c4823ff193e4e4fdc0abe435fd32 (patch) | |
| tree | f980ff2d43b2546a63048e5ab8792f170c490483 /configs | |
| parent | d29244d8720c95f9e9869a51360902132b4b9c7e (diff) | |
Move the debian/debian-dri configurations to debian-default/debian-dri-default
respectively, and use debian/debian-dri to choose an architecture specific
configuration.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/debian | 12 | ||||
| -rw-r--r-- | configs/debian-default | 8 | ||||
| -rw-r--r-- | configs/debian-dri | 9 | ||||
| -rw-r--r-- | configs/debian-dri-default | 5 |
4 files changed, 25 insertions, 9 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 + |