Build architecture-specific static libraries where available.

1 files changed, 9 insertions, 10 deletions

diff --git a/debian/rules b/debian/rules
index 342cd1316e9..02ecb099edc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,19 +26,22 @@ DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
 
 export DEB_BUILD_ARCH
 
-# choose an architecture-specific configuration for building swx11 and GLU if
-# one exists
+# choose an architecture-specific build of swx11 and GLU if a matching
+# configuration exists
 ifneq ($(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),)
 	SWX11_GLU_CONFIGS := debian-swx11+glu-$(DEB_BUILD_ARCH)
 else
 	SWX11_GLU_CONFIGS := debian-swx11+glu-any
 endif
 
-# build a static version of swx11 and GLU as well
-SWX11_GLU_CONFIGS += debian-swx11+glu-static
+# same for static builds
+ifneq ($(wildcard configs/debian-swx11+glu-static-$(DEB_BUILD_ARCH)),)
+	SWX11_GLU_CONFIGS += debian-swx11+glu-static-$(DEB_BUILD_ARCH)
+else
+	SWX11_GLU_CONFIGS += debian-swx11+glu-static-any
+endif
 
-# choose an architecture-specific configuration for building the DRI-enabled
-# libGL if one exists
+# and for the GLX/DRI-enabled libGL
 ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
 	DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
 else
@@ -64,10 +67,6 @@ endif
 #	SWX11_GLU_CONFIGS += debian-swx11+glu-sparc-ultrasparc
 #endif
 
-# Use the following to automatically build all optimized configurations
-# available for the build architecture. Use with caution =)
-#SWX11_GLU_CONFIGS += $(subst configs/,,$(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)-*))
-
 # build the following configurations by default
 CONFIGS = $(SWX11_GLU_CONFIGS) \
           $(DRI_CONFIGS) \