On 5 mar 2009, at 15.45, Joel Bosveld wrote:
This is based off of DRI_DRIVER_INSTALL_DIR, and also what xf86- video-ati does. Not sure if XORG_DRIVER_DIR is the correct way to do this?
Looks good, but I think XORG_DRIVER_INSTALL_DIR is better, keeping it in line with DRI_DRIVER_INSTALL_DIR.
Can you spin a new version with that change, and it is Acked-by: Jakob Bornecrantz <[email protected]> Cheers Jakob.
----- From 529bcc910f00cbf86e68230361d401a130a8584d Mon Sep 17 00:00:00 2001 From: Joel Bosveld <[email protected]> Date: Thu, 5 Mar 2009 23:33:22 +0900 Subject: [PATCH] gallium-xorg: Install to XORG_DRIVER_DIR --- configs/autoconf.in | 3 +++ configs/default | 3 +++ configure.ac | 7 +++++++ src/gallium/winsys/drm/intel/xorg/Makefile | 3 ++- src/gallium/winsys/drm/radeon/xorg/Makefile | 3 ++- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configs/autoconf.in b/configs/autoconf.in index e034431..39e0272 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -123,6 +123,9 @@ DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@ # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) +# Xorg driver directory (for xorg state-tracker) +XORG_DRIVER_DIR = @XORG_DRIVER_DIR@ + # pkg-config substitutions GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ diff --git a/configs/default b/configs/default index 4eecd9c..a650d22 100644 --- a/configs/default +++ b/configs/default @@ -122,6 +122,9 @@ DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) +# Xorg driver directory (for xorg state-tracker) +XORG_DRIVER_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers + # pkg-config substitutions GL_PC_REQ_PRIV = GL_PC_LIB_PRIV = diff --git a/configure.ac b/configure.ac index 919b717..0447f40 100644 --- a/configure.ac +++ b/configure.ac @@ -1134,6 +1134,13 @@ yes) ;; esac +AC_ARG_WITH([xorg-driver-dir], + [AS_HELP_STRING([--xorg-driver-dir=DIR],+ [Default xorg driver directory [[default=$ {libdir}/xorg/modules/drivers]]])],+ [XORG_DRIVER_DIR="$withval"], + [XORG_DRIVER_DIR="${libdir}/xorg/modules/drivers"]) +AC_SUBST([XORG_DRIVER_DIR]) + dnl dnl Gallium Intel configuration dnldiff --git a/src/gallium/winsys/drm/intel/xorg/Makefile b/src/ gallium/winsys/drm/intel/xorg/Makefileindex 8130fdb..0d6ed8a 100644 --- a/src/gallium/winsys/drm/intel/xorg/Makefile +++ b/src/gallium/winsys/drm/intel/xorg/Makefile @@ -37,6 +37,7 @@ clean: rm -rf $(OBJECTS) $(TARGET) install: - cp $(TARGET) /opt/kms/lib/xorg/modules/drivers + $(INSTALL) -d $(DESTDIR)/$(XORG_DRIVER_DIR) + $(INSTALL) -m 755 $(TARGET) $DESTDIR)/$(XORG_DRIVER_DIR) .PHONY = all clean installdiff --git a/src/gallium/winsys/drm/radeon/xorg/Makefile b/src/ gallium/winsys/drm/radeon/xorg/Makefileindex e37261a..ddbf554 100644 --- a/src/gallium/winsys/drm/radeon/xorg/Makefile +++ b/src/gallium/winsys/drm/radeon/xorg/Makefile @@ -36,6 +36,7 @@ clean: rm -rf $(OBJECTS) $(TARGET) install: - cp $(TARGET) /opt/kms/lib/xorg/modules/drivers + $(INSTALL) -d $(DESTDIR)/$(XORG_DRIVER_DIR) + $(INSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_DIR) .PHONY = all clean install -- 1.6.0.3 <ATT00001.txt><ATT00002.txt>
------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H
_______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
