aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-07-08 11:02:04 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-07-08 11:02:04 +0000
commitaa99b8ff4fe21386791da7a206eda963c96bf32f (patch)
treebe0f6df9ce63b04a38840f73c5a4d8536e3f756c
parentd88443ae89a50f3cc8f3b336389ab45180612579 (diff)
downloadffmpeg-aa99b8ff4fe21386791da7a206eda963c96bf32f.tar.gz
spaces in the patch fix by (Nicolas Boos <nicolas.boos at wanadoo dot fr>)
Originally committed as revision 3296 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile11
-rw-r--r--vhook/Makefile3
2 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 420275eaf0..999b79e830 100644
--- a/Makefile
+++ b/Makefile
@@ -135,16 +135,13 @@ wininstaller: all install
install-man:
ifneq ($(CONFIG_WIN32),yes)
if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
- install -d $(mandir)/man1 ; \
- install -m 644 $(MANPAGE) $(mandir)/man1 ; \
+ install -d "$(mandir)/man1" ; \
+ install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
fi
endif
-install-vhook: $(prefix)/lib/vhook
- $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
-
-$(prefix)/lib/vhook:
- install -d $@
+install-vhook:
+ $(MAKE) -C vhook install
installlib:
$(MAKE) -C libavcodec installlib
diff --git a/vhook/Makefile b/vhook/Makefile
index 3a893189ab..f645b1bdf2 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -26,7 +26,8 @@ depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
install:
- install -m 755 $(HOOKS) $(INSTDIR)
+ install -d "$(prefix)/lib/vhook"
+ install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
imlib2.so: imlib2.o
$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2