7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
PSARC/2011/213 X Synchronization Extension version 3.1
PSARC/2011/214 Xorg server 1.10
# Where libGL will look for DRI hardware drivers
--- src/glu/Makefile Mon Mar 1 09:54:01 2010
+++ src/glu/Makefile Mon Mar 1 09:56:50 2010
@@ -29,9 +29,9 @@
install: glu.pc
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLU_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_PC_DIR)
clean:
-@for dir in $(SUBDIRS) ; do \
--- src/glw/Makefile Mon Mar 1 09:57:10 2010
+++ src/glw/Makefile Mon Mar 1 09:57:34 2010
@@ -41,10 +41,10 @@
install: glw.pc
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
$(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_PC_DIR)
clean:
-rm -f depend depend.bak
--- src/mesa/Makefile Mon Mar 1 09:57:46 2010
+++ src/mesa/Makefile Mon Mar 1 10:01:04 2010
@@ -128,17 +128,17 @@
install-libgl: default gl.pc install-headers
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
$(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_PC_DIR)
install-osmesa: default osmesa.pc
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
$(DESTDIR)$(INSTALL_LIB_DIR)
- $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_PC_DIR)
install-dri: default
cd drivers/dri && $(MAKE) install
--- configs/default Wed Apr 20 08:55:46 2011
+++ configs/default Wed Apr 20 08:56:29 2011
@@ -137,6 +137,7 @@
INSTALL_DIR = /usr/local
INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
INSTALL_INC_DIR = $(INSTALL_DIR)/include
+INSTALL_PC_DIR = $(INSTALL_LIB_DIR)/pkgconfig
DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
# Where libGL will look for DRI hardware drivers