st/xorg: Install to XORG_DRIVER_INSTALL_DIR

diff --git a/configs/autoconf.in b/configs/autoconf.in
index e034431618168c998705f8126bdd437850f52218..b61d7f33f009eb97bb101c52ac15074923d29716 100644 (file)
--- 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 install directory (for xorg state-tracker)
+XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_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 4eecd9cd52f2f6443c835cd595422e9a39843409..eab36a36775411149c3eb12cec6e53062937e100 100644 (file)
--- 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 install directory (for xorg state-tracker)
+XORG_DRIVER_INSTALL_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 919b717db468bfe8b568c31e483e7cf4d6f0ba33..46070fd73c91433d6ef0673ad26559834d7ab911 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1134,6 +1134,13 @@ yes)
     ;;
 esac
 
+AC_ARG_WITH([xorg-driver-dir],
+    [AS_HELP_STRING([--with-xorg-driver-dir=DIR],
+                    [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],
+    [XORG_DRIVER_INSTALL_DIR="$withval"],
+    [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"])
+AC_SUBST([XORG_DRIVER_INSTALL_DIR])
+
 dnl
 dnl Gallium Intel configuration
 dnl

diff --git a/src/gallium/winsys/drm/intel/xorg/Makefile b/src/gallium/winsys/drm/intel/xorg/Makefile
index 8130fdb226503ed5e5532f6c1ad64b9fbe823486..a45ca570db19b9e434ec12e7746ed1e83371e3b9 100644 (file)
--- 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_INSTALL_DIR)
+       $(INSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR)
 
 .PHONY = all clean install

diff --git a/src/gallium/winsys/drm/radeon/xorg/Makefile b/src/gallium/winsys/drm/radeon/xorg/Makefile
index e37261aa63fef56f91bddc8568684dc8ef887874..6ffd4a3a541291c58702f1c2a02bcbb1bee5589a 100644 (file)
--- 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_INSTALL_DIR)
+       $(INSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR)
 
 .PHONY = all clean install