diff --git a/configs/autoconf.in b/configs/autoconf.in index 296bf30..149202b 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -178,6 +178,9 @@ VA_LIB_INSTALL_DIR=@VA_LIB_INSTALL_DIR@ # Xorg driver install directory (for xorg state-tracker) XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@ +# XVMC library install directory +XVMC_LIB_INSTALL_DIR=@XVMC_LIB_INSTALL_DIR@ + # pkg-config substitutions GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ diff --git a/configure.ac b/configure.ac index 1c437e7..4e3d9d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1821,6 +1821,14 @@ AC_ARG_WITH([va-libdir], [VA_LIB_INSTALL_DIR='${libdir}/va']) AC_SUBST([VA_LIB_INSTALL_DIR]) +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@:>@])], + [XVMC_LIB_INSTALL_DIR="$withval"], + [XVMC_LIB_INSTALL_DIR='${libdir}/xvmc']) +AC_SUBST([XVMC_LIB_INSTALL_DIR]) + dnl dnl Gallium helper functions dnl diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc index 217481e..6c57280 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 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