diff options
| author | Joel Bosveld <Joel.Bosveld@gmail.com> | 2009-03-06 08:46:08 +0900 |
|---|---|---|
| committer | Jakob Bornecrantz <wallbraker@gmail.com> | 2009-03-06 01:31:49 +0100 |
| commit | 8acca48cd575335b33cdc8fed6906f4d656233cc (patch) | |
| tree | 5d56027d8de67452ff042d353ae98a764da8daf5 | |
| parent | 9ffc1784b43ffa410a6a01d0c651efccbb2dc993 (diff) | |
st/xorg: Install to XORG_DRIVER_INSTALL_DIR
| -rw-r--r-- | configs/autoconf.in | 3 | ||||
| -rw-r--r-- | configs/default | 3 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/intel/xorg/Makefile | 3 | ||||
| -rw-r--r-- | 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 e0344316181..b61d7f33f00 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 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 4eecd9cd52f..eab36a36775 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 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 919b717db46..46070fd73c9 100644 --- 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 8130fdb2265..a45ca570db1 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_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 e37261aa63f..6ffd4a3a541 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_INSTALL_DIR) + $(INSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR) .PHONY = all clean install |