summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-23 17:01:59 +0200
committerwm4 <wm4@nowhere>2012-10-23 17:01:59 +0200
commit36cd169f6b1ed9e5f326bfed2d1b1d21fa4ef6ae (patch)
tree9a3c9d6749d87f06bdd60c5093bea5dd28c1eb08
parentb0a476b32ee6d5acf17cd23c93153a18cd17c8e5 (diff)
downloadmpv-build-36cd169f6b1ed9e5f326bfed2d1b1d21fa4ef6ae.tar.bz2
mpv-build-36cd169f6b1ed9e5f326bfed2d1b1d21fa4ef6ae.tar.xz
Fix compilation on systems where autoconf will use lib64 instead of lib
At least on openSUSE 12.2 x86_64, autoconf will install libass' library files into build_libs/lib64. Since we set PKG_CONFIG_PATH to build_libs/lib/pkgconfig, mpv compilation won't find the libass.pc file. Even worse, if libass is globally installed too, mpv will still use the local libass headers in build_libs/include, while linking with the globally installed libass. Fix by forcing autoconf always to use build_libs/lib.
-rwxr-xr-xscripts/libass-config2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/libass-config b/scripts/libass-config
index 5644d6a..d27d769 100755
--- a/scripts/libass-config
+++ b/scripts/libass-config
@@ -5,4 +5,4 @@ OPTIONS=""
BUILD="$(pwd)"
cd "$BUILD"/libass
-./autogen.sh --prefix="$BUILD/build_libs" --enable-static --disable-shared $OPTIONS
+./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS