spaces in the patch fix by (Nicolas Boos <nicolas.boos at wanadoo dot fr>)
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Jul 2004 11:02:04 +0000 (11:02 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Jul 2004 11:02:04 +0000 (11:02 +0000)
Originally committed as revision 3296 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
vhook/Makefile

index 420275e..999b79e 100644 (file)
--- 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
index 3a89318..f645b1b 100644 (file)
@@ -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