You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-11-06 08:29:25 +02:00
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
This commit is contained in:
committed by
Michael Niedermayer
parent
ac930a999c
commit
8b8e1c5580
8
Makefile
8
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
|
||||
|
||||
Reference in New Issue
Block a user