summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-03-23 10:07:00 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-03-23 10:07:00 +0000
commitf876d13f452de8c5328a4b4dfe894501e27fe333 (patch)
treea9a9c36f9cb5e7fe26a0730c75f6b2c9399cdec8
parentdb844bc9f6adfa370f4e46a3306628a90fcb0873 (diff)
downloadmpv-f876d13f452de8c5328a4b4dfe894501e27fe333.tar.bz2
mpv-f876d13f452de8c5328a4b4dfe894501e27fe333.tar.xz
Fix shared libpostproc installation.
based on a patch by Rene Rebe <rene at exactcode dot de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14995 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile3
-rwxr-xr-xconfigure2
2 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3df07e3e88..5ebeb977d6 100644
--- a/Makefile
+++ b/Makefile
@@ -283,6 +283,9 @@ install: $(ALL_PRG)
ifeq ($(VIDIX),yes)
$(DO_MAKE)
endif
+ifeq ($(SHARED_PP),yes)
+ $(MAKE) install -C libavcodec/libpostproc
+endif
if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
ifeq ($(GUI),yes)
diff --git a/configure b/configure
index a53c8d06fd..8d65993e09 100755
--- a/configure
+++ b/configure
@@ -6672,6 +6672,8 @@ DATADIR = \$(DESTDIR)$_datadir
MANDIR = \$(DESTDIR)$_mandir
CONFDIR = \$(DESTDIR)$_confdir
LIBDIR = \$(DESTDIR)$_libdir
+# FFmpeg uses libdir instead of LIBDIR
+libdir = \$(LIBDIR)
#AR = ar
CC = $_cc
HOST_CC = $_host_cc