Adjust the build system to install the dri target in a seperate DESTDIR.

No longer passing --libdir=/usr/lib/glx at configure time to the dri
target means generated .pc's will contain the correct info, which will
be important for 7.9 as a large number of packages create them in that
target.

19 files changed, 55 insertions, 42 deletions

diff --git a/debian/changelog b/debian/changelog
index 7632bbb930d..89e2d48e183 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.8.1-3) UNRELEASED; urgency=low
+
+  * Adjust the build system to install the dri target in a seperate
+    DESTDIR, no longer passing --libdir=/usr/lib/glx at configure time
+    messing with the .pc's since it is used for a majority of the 
+    packages now.
+
+ -- Robert Hooker <sarvatt@ubuntu.com>  Fri, 11 Jun 2010 09:46:20 -0400
+
 mesa (7.8.1-2) experimental; urgency=low
 
   [ Tormod Volden ]
diff --git a/debian/libegl1-mesa-dev.install b/debian/libegl1-mesa-dev.install
index c0d987932bc..1bff6dd0ade 100644
--- a/debian/libegl1-mesa-dev.install
+++ b/debian/libegl1-mesa-dev.install
@@ -1,4 +1,4 @@
-usr/lib/glx/libEGL.so usr/lib
-usr/include/EGL
-usr/include/KHR
+dri/usr/lib/libEGL.so usr/lib
+dri/usr/include/EGL usr/include
+dri/usr/include/KHR usr/include
 debian/egl.pc usr/lib/pkgconfig
diff --git a/debian/libegl1-mesa-drivers-kms.install b/debian/libegl1-mesa-drivers-kms.install
index ced97187d93..96f99021db6 100644
--- a/debian/libegl1-mesa-drivers-kms.install
+++ b/debian/libegl1-mesa-drivers-kms.install
@@ -1 +1 @@
-usr/lib/glx/egl/egl_kms_*.so
+dri/usr/lib/egl/egl_kms_*.so usr/lib/egl
diff --git a/debian/libegl1-mesa-drivers-x11.install b/debian/libegl1-mesa-drivers-x11.install
index 130d5e5d021..17c52f4b747 100644
--- a/debian/libegl1-mesa-drivers-x11.install
+++ b/debian/libegl1-mesa-drivers-x11.install
@@ -1 +1 @@
-usr/lib/glx/egl/egl_x11_*.so
+dri/usr/lib/egl/egl_x11_*.so usr/lib/egl
diff --git a/debian/libegl1-mesa.install b/debian/libegl1-mesa.install
index 3c9a6a9fea6..d7d21682746 100644
--- a/debian/libegl1-mesa.install
+++ b/debian/libegl1-mesa.install
@@ -1,3 +1,3 @@
-usr/lib/glx/libEGL.so.1* usr/lib
-usr/lib/glx/egl/egl_dri2.so usr/lib/egl
-usr/lib/glx/egl/egl_glx.so usr/lib/egl
+dri/usr/lib/libEGL.so.1* usr/lib
+dri/usr/lib/egl/egl_dri2.so usr/lib/egl
+dri/usr/lib/egl/egl_glx.so usr/lib/egl
diff --git a/debian/libgl1-mesa-dri-experimental.install b/debian/libgl1-mesa-dri-experimental.install
index f3a0b809d87..d6170b8d7bd 100644
--- a/debian/libgl1-mesa-dri-experimental.install
+++ b/debian/libgl1-mesa-dri-experimental.install
@@ -1 +1 @@
-build/dri/glx/gallium/nouveau_dri.so usr/lib/dri
+build/dri/lib/gallium/nouveau_dri.so usr/lib/dri
diff --git a/debian/libgl1-mesa-dri-i686.install b/debian/libgl1-mesa-dri-i686.install
index 44b5c55214d..847043ca2e0 100644
--- a/debian/libgl1-mesa-dri-i686.install
+++ b/debian/libgl1-mesa-dri-i686.install
@@ -1 +1 @@
-usr/lib/dri/i686/cmov/*.so
+dri/usr/lib/dri/i686/cmov/*.so
diff --git a/debian/libgl1-mesa-dri.install b/debian/libgl1-mesa-dri.install
index 7be84316cd5..0863d8cff56 100644
--- a/debian/libgl1-mesa-dri.install
+++ b/debian/libgl1-mesa-dri.install
@@ -1 +1 @@
-build/dri/glx/*_dri.so  usr/lib/dri/
+build/dri/lib/*_dri.so  usr/lib/dri/
diff --git a/debian/libgl1-mesa-glx-i686.install b/debian/libgl1-mesa-glx-i686.install
index 4c8ef3b34b6..674225225b1 100644
--- a/debian/libgl1-mesa-glx-i686.install
+++ b/debian/libgl1-mesa-glx-i686.install
@@ -1 +1 @@
-usr/lib/glx/i686/cmov/libGL.so.* usr/lib/i686/cmov
+dri/usr/lib/i686/cmov/libGL.so.* usr/lib/i686/cmov
diff --git a/debian/libgl1-mesa-glx.install b/debian/libgl1-mesa-glx.install
index 1a30ecd7cbd..870ee94a015 100644
--- a/debian/libgl1-mesa-glx.install
+++ b/debian/libgl1-mesa-glx.install
@@ -1 +1 @@
-usr/lib/glx/libGL.so.* usr/lib
+dri/usr/lib/libGL.so.* usr/lib
diff --git a/debian/libgles1-mesa-dev.install b/debian/libgles1-mesa-dev.install
index 346781d65eb..19b037a12c9 100644
--- a/debian/libgles1-mesa-dev.install
+++ b/debian/libgles1-mesa-dev.install
@@ -1,3 +1,3 @@
-usr/glx/libGLESv1_CM.so usr/lib
-usr/include/GLES
+dri/usr/lib/libGLESv1_CM.so usr/lib
+dri/usr/include/GLES usr/include
 debian/glesv1_cm.pc usr/lib/pkgconfig
diff --git a/debian/libgles1-mesa.install b/debian/libgles1-mesa.install
index 6efedaa21ae..ac54a2afd63 100644
--- a/debian/libgles1-mesa.install
+++ b/debian/libgles1-mesa.install
@@ -1 +1 @@
-usr/glx/libGLESv1_CM.so.1* usr/lib
+dri/usr/lib/libGLESv1_CM.so.1* usr/lib
diff --git a/debian/libgles2-mesa-dev.install b/debian/libgles2-mesa-dev.install
index d2d4a333ce7..e3597edf7f3 100644
--- a/debian/libgles2-mesa-dev.install
+++ b/debian/libgles2-mesa-dev.install
@@ -1,3 +1,3 @@
-usr/glx/libGLESv2.so usr/lib
-usr/include/GLES2
+dri/usr/lib/libGLESv2.so usr/lib
+dri/usr/include/GLES2 usr/include
 debian/glesv2.pc usr/lib/pkgconfig
diff --git a/debian/libgles2-mesa.install b/debian/libgles2-mesa.install
index 57bfec3809d..9be036e0074 100644
--- a/debian/libgles2-mesa.install
+++ b/debian/libgles2-mesa.install
@@ -1 +1 @@
-usr/glx/libGLESv2.so.2* usr/lib
+dri/usr/lib/libGLESv2.so.2* usr/lib
diff --git a/debian/libopenvg1-mesa-dev.install b/debian/libopenvg1-mesa-dev.install
index d144af0016c..220da533774 100644
--- a/debian/libopenvg1-mesa-dev.install
+++ b/debian/libopenvg1-mesa-dev.install
@@ -1,3 +1,3 @@
-usr/glx/libOpenVG.so usr/lib
-usr/include/VG
+dri/usr/lib/libOpenVG.so usr/lib
+dri/usr/include/VG usr/include
 debian/vg.pc usr/lib/pkgconfig
diff --git a/debian/libopenvg1-mesa.install b/debian/libopenvg1-mesa.install
index e94867cc168..0b529635852 100644
--- a/debian/libopenvg1-mesa.install
+++ b/debian/libopenvg1-mesa.install
@@ -1 +1 @@
-usr/glx/libOpenVG.so.1* usr/lib
+dri/usr/lib/libOpenVG.so.1* usr/lib
diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install
index 9e68baf2d32..ad10d330dcd 100644
--- a/debian/mesa-common-dev.install
+++ b/debian/mesa-common-dev.install
@@ -1,8 +1,8 @@
-usr/include/GL/gl.h
-usr/include/GL/glext.h
-usr/include/GL/gl_mangle.h
-usr/include/GL/glx.h
-usr/include/GL/glxext.h
-usr/include/GL/glx_mangle.h
-usr/include/GL/internal/dri_interface.h
-usr/lib/glx/pkgconfig/dri.pc usr/lib/pkgconfig/
+dri/usr/include/GL/gl.h usr/include
+dri/usr/include/GL/glext.h usr/include
+dri/usr/include/GL/gl_mangle.h usr/include
+dri/usr/include/GL/glx.h usr/include
+dri/usr/include/GL/glxext.h usr/include
+dri/usr/include/GL/glx_mangle.h usr/include
+dri/usr/include/GL/internal/dri_interface.h usr/include
+dri/usr/lib/pkgconfig/dri.pc usr/lib/pkgconfig/
diff --git a/debian/mesa-utils.install b/debian/mesa-utils.install
index 4d4d07e3f00..c30af12002a 100644
--- a/debian/mesa-utils.install
+++ b/debian/mesa-utils.install
@@ -1,4 +1,4 @@
-usr/bin/glxdemo
-usr/bin/glxgears
-usr/bin/glxheads
-usr/bin/glxinfo
+dri/usr/bin/glxdemo usr/bin
+dri/usr/bin/glxgears usr/bin
+dri/usr/bin/glxheads usr/bin
+dri/usr/bin/glxinfo usr/bin
diff --git a/debian/rules b/debian/rules
index eb7823113a9..dd5bf35920c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@
 #export DH_VERBOSE=1
 
 CFLAGS = -Wall -g
+ifeq (,$(filter ccache,$(DEB_BUILD_OPTIONS)))
+	CC := ccache $(CC)
+	CXX := ccache $(CXX)
+endif
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -101,7 +105,6 @@ confflags-dri = \
 	--with-driver=dri \
 	--with-dri-drivers="$(DRI_DRIVERS)" \
 	--with-demos=xdemos \
-	--libdir=/usr/lib/glx \
 	--with-dri-driverdir=/usr/lib/dri \
 	--with-egl-displays="$(EGL_DISPLAYS)" \
 	--enable-glx-tls \
@@ -217,7 +220,7 @@ $(STAMP)-build-%: configure
 	find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | \
 		xargs cp -rlf -t $(DEB_BUILD_DIR)/$*
 	cd $(DEB_BUILD_DIR)/$* && \
-	../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+	../../configure CC="$(CC)" CXX="$(CXX)" --prefix=/usr --mandir=\$${prefix}/share/man \
 	             --infodir=\$${prefix}/share/info --sysconfdir=/etc \
 	             --localstatedir=/var $(confflags) $(confflags-$*)
 	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
@@ -230,9 +233,10 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	set -e; for config in $(CONFIGS); do \
+	set -e; for config in $(filter-out dri, $(CONFIGS)); do \
 		$(MAKE) -C $(DEB_BUILD_DIR)/$$config DESTDIR=$(CURDIR)/debian/tmp install; \
 	done
+	$(MAKE) -C $(DEB_BUILD_DIR)/dri DESTDIR=$(CURDIR)/debian/tmp/dri install
 
 clean: unpatch
 	dh_testdir
@@ -265,16 +269,16 @@ binary-arch: install
 	# Classic DRI and Gallium DRI are mixed up together here
 	# Remove the whole tree to avoid false-positives in --list-missing, and
 	# install the right files manually.
-	rm -r debian/tmp/usr/lib/dri
+	rm -r debian/tmp/dri/usr/lib/dri
 	# Radeon searches for r{200,300,600}_dri only, but the gallium driver
 	# is (at the moment) radeong_dri.  Rename it to r300_dri, as it
 	# fails to support r600.
-	mv build/dri/glx/gallium/radeong_dri.so \
-		build/dri/glx/gallium/r300_dri.so
+	mv build/dri/lib/gallium/radeong_dri.so \
+		build/dri/lib/gallium/r300_dri.so
 	# Intel i965 Gallium appears to do nothing more than generate GPU 
 	# lockups.  Kill it with fire.  i915 is apparently useful.
-	-rm build/dri/glx/gallium/i965_dri.so
-	-rm debian/tmp/usr/lib/glx/egl/egl_*_i965.so
+	-rm build/dri/lib/gallium/i965_dri.so
+	-rm debian/tmp/dri/usr/lib/egl/egl_*_i965.so
 
 	dh_install -s --list-missing
 	dh_installman -s