Browse Source

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
tags/v0.5
Michael Niedermayer 21 years ago
parent
commit
aa99b8ff4f
2 changed files with 6 additions and 8 deletions
  1. +4
    -7
      Makefile
  2. +2
    -1
      vhook/Makefile

+ 4
- 7
Makefile View File

@@ -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


+ 2
- 1
vhook/Makefile View 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


Loading…
Cancel
Save