diff options
| author | Alexandre Demers <[email protected]> | 2012-04-04 10:54:56 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2012-04-04 10:57:50 +0200 |
| commit | 3ea3695b0495a56d9946a292e0e7cad4e0fb2fe0 (patch) | |
| tree | 9f57bbacca3ce6fd1ae383a93ccdfd60e2972dbb | |
| parent | 75f8990547903f7dde5d98319cc813f94a15aa78 (diff) | |
st/xvmc: fix library installation dir
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=47878
v2: some reordering and while at it also fix the
comment in Makefile.xvmc
Signed-off-by: Christian König <[email protected]>
| -rw-r--r-- | configs/autoconf.in | 3 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/gallium/targets/Makefile.xvmc | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 296bf30d95a..95cca6f239e 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -169,6 +169,9 @@ DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@ # EGL driver install directory EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@ +# XVMC library install directory +XVMC_LIB_INSTALL_DIR=@XVMC_LIB_INSTALL_DIR@ + # VDPAU library install directory VDPAU_LIB_INSTALL_DIR=@VDPAU_LIB_INSTALL_DIR@ diff --git a/configure.ac b/configure.ac index 135bacf7f46..21e4308faf4 100644 --- a/configure.ac +++ b/configure.ac @@ -1816,6 +1816,14 @@ else MESA_LLVM=0 fi +dnl Directory for XVMC libs +AC_ARG_WITH([xvmc-libdir], + [AS_HELP_STRING([--with-xvmc-libdir=DIR], + [directory for the XVMC libraries @<:@default=${libdir}@:>@])], + [XVMC_LIB_INSTALL_DIR="$withval"], + [XVMC_LIB_INSTALL_DIR='${libdir}']) +AC_SUBST([XVMC_LIB_INSTALL_DIR]) + dnl Directory for VDPAU libs AC_ARG_WITH([vdpau-libdir], [AS_HELP_STRING([--with-vdpau-libdir=DIR], diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc index ad9dd2d4817..ff1af4f4725 100644 --- a/src/gallium/targets/Makefile.xvmc +++ b/src/gallium/targets/Makefile.xvmc @@ -1,7 +1,7 @@ -# This makefile template is used to build libXvMCg3dvl.so +# This makefile template is used to build libXvMC*.so LIBNAME = lib$(LIBBASENAME).so -LIB_GLOB=lib$(LIBBASENAME).*so* +XVMC_LIB_GLOB=lib$(LIBBASENAME).*so* XVMC_MAJOR = 1 XVMC_MINOR = 0 INCLUDES = -I$(TOP)/src/gallium/include \ @@ -67,7 +67,7 @@ clean: -rm -f depend depend.bak install: default - $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) - $(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(LIB_GLOB) $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -d $(DESTDIR)$(XVMC_LIB_INSTALL_DIR) + $(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(XVMC_LIB_GLOB) $(DESTDIR)$(XVMC_LIB_INSTALL_DIR) include depend |