Out-of-directory build patch by (Philipp Matthias Hahn <pmhahn titan.lahn de>)

preserve support for spaces in directories in case of in-tree builds by (James A. Morrison <ja2morri csclub.uwaterloo ca>)

Originally committed as revision 3855 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 19 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index db8bcea5e4..a4c67453a3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,18 @@ CFLAGS+=-p
 LDFLAGS+=-p
 endif
 
-MANPAGE=$(SRC_PATH)/doc/ffmpeg.1
+MANPAGE=doc/ffmpeg.1
 PROG=ffmpeg$(EXESUF)
 PROGTEST=output_example$(EXESUF)
 QTFASTSTART=qt-faststart$(EXESUF)
 
 ifeq ($(CONFIG_FFSERVER),yes)
-MANPAGE+=$(SRC_PATH)/doc/ffserver.1
+MANPAGE+=doc/ffserver.1
 PROG+=ffserver$(EXESUF)
 endif
 
 ifeq ($(CONFIG_FFPLAY),yes)
-MANPAGE+=$(SRC_PATH)/doc/ffplay.1
+MANPAGE+=doc/ffplay.1
 PROG+=ffplay$(EXESUF)
 FFPLAY_O=ffplay.o
 endif
@@ -146,7 +146,7 @@ wininstaller: all install
 # install man from source dir if available
 install-man:
 ifneq ($(CONFIG_WIN32),yes)
-	if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
+	if [ -f doc/ffmpeg.1 ] ; then \
 	    install -d "$(mandir)/man1" ; \
 	    install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
 	fi
diff --git a/configure b/configure
index b5ddb48f5b..e0766ffa1f 100755
--- a/configure
+++ b/configure
@@ -1453,17 +1453,22 @@ fi
 
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then
-    DIRS="libavformat libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \
-          libavcodec/ppc libavcodec/liba52 libavcodec/mlib libavcodec/libpostproc tests vhook"
-    FILES="Makefile libavformat/Makefile libavcodec/Makefile libavcodec/libpostproc/Makefile tests/Makefile vhook/Makefile"
+    DIRS="doc libavformat libavcodec libavcodec/alpha libavcodec/armv4l \
+          libavcodec/i386 libavcodec/sparc libavcodec/mlib \
+          libavcodec/ppc libavcodec/liba52 libavcodec/libpostproc tests vhook"
+    FILES="Makefile libavformat/Makefile libavcodec/Makefile \
+          libavcodec/libpostproc/Makefile tests/Makefile vhook/Makefile \
+          doc/Makefile doc/texi2pod.pl"
     for dir in $DIRS ; do
             mkdir -p $dir
     done
     for f in $FILES ; do
         ln -sf "$source_path/$f" $f
     done
+    echo "SRC_PATH=$source_path" >> config.mak
+else
+    echo "SRC_PATH='$source_path'" >> config.mak
 fi
-echo "SRC_PATH='$source_path'" >> config.mak
 
 if test "$amr_wb" = "yes" ; then
   echo "#define AMR_WB 1" >> $TMPH
diff --git a/doc/Makefile b/doc/Makefile
index d472dc3297..744a9fbc18 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,3 +1,7 @@
+-include ../config.mak
+
+VPATH=$(SRC_PATH)/doc
+
 all: ffmpeg-doc.html faq.html ffserver-doc.html ffplay-doc.html hooks.html \
      ffmpeg.1 ffserver.1 ffplay.1
 
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c2169befe0..fe468ca5ad 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -216,7 +216,7 @@ $(LIB): $(OBJS) $(AMRLIBS)
 
 $(SLIB): $(OBJS)
 ifeq ($(CONFIG_PP),yes)
-	$(MAKE) -C $(VPATH)/libpostproc
+	$(MAKE) -C libpostproc
 endif
 ifeq ($(CONFIG_WIN32),yes)
 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
@@ -299,7 +299,7 @@ else
 	ldconfig || true
 endif
 ifeq ($(CONFIG_PP),yes)
-	$(MAKE) -C $(VPATH)/libpostproc $@
+	$(MAKE) -C libpostproc $@
 endif
 else
 install: