summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPhilipp Matthias Hahn <pmhahn@titan.lahn.de>2005-01-21 22:16:05 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-01-21 22:16:05 +0000
commit8b8e1c5580592ae207a9c2e9592bcef906ad3fd4 (patch)
tree838fdd0cd86faa3e34a94c329a0328be044a8b9e /Makefile
parentac930a999cf1d990c840f5f4286ce7f421df7160 (diff)
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 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