summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-05 10:03:53 +0000
committerhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-05 10:03:53 +0000
commitd5584df16c81019712dd25e5a7407f09c816c494 (patch)
tree38d98814bd926ce12e08aa28c53cdefce2da1fed
parent41d2f9a704a70f45012f9f48764b41c364c058f5 (diff)
downloadmpv-d5584df16c81019712dd25e5a7407f09c816c494.tar.bz2
mpv-d5584df16c81019712dd25e5a7407f09c816c494.tar.xz
use relative paths for libav* build
absolute path in the command line can confuse ccache git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17734 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile8
-rwxr-xr-xconfigure1
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 935a534a32..c6176a9df8 100644
--- a/Makefile
+++ b/Makefile
@@ -303,16 +303,16 @@ loader/dmo/libDMO_Filter.a:
$(MAKE) -C loader/dmo
libavutil/libavutil.a:
- $(MAKE) -C libavutil LIBPREF=lib LIBSUF=.a
+ $(MAKE) -C libavutil LIBPREF=lib LIBSUF=.a SRC_PATH=..
libavcodec/libavcodec.a:
- $(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a
+ $(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a SRC_PATH=..
libavcodec/libpostproc/libpostproc.a:
- $(MAKE) -C libavcodec/libpostproc LIBPREF=lib LIBSUF=.a
+ $(MAKE) -C libavcodec/libpostproc LIBPREF=lib LIBSUF=.a SRC_PATH=../..
libavformat/libavformat.a:
- $(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a
+ $(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a SRC_PATH=..
libmpeg2/libmpeg2.a:
$(MAKE) -C libmpeg2
diff --git a/configure b/configure
index ecc8de293c..a28905c493 100755
--- a/configure
+++ b/configure
@@ -7249,7 +7249,6 @@ X11DIR = $_ld_x11
HAVE_XVMC_ACCEL = $_xvmc
# for FFmpeg
-SRC_PATH=`pwd`
LIBPREF=lib
LIBSUF=.a
LIB=\$(LIBPREF)\$(NAME)\$(LIBSUF)