--- Makefile.o 2005-03-01 10:43:21 +0300 +++ fftv/key-map/Makefile 2005-03-01 10:44:13 +0300 @@ -3,9 +3,9 @@ all: install: - install -d $(FFTV_LIRC) - install -m 644 lirc/* $(FFTV_LIRC) - install -d $(libdir)/$(FFTV_X11) - install -m 644 fftv_xkey.map $(FFTV_X11) + install -d $(DESTDIR)$(FFTV_LIRC) + install -m 644 lirc/* $(DESTDIR)$(FFTV_LIRC) + install -d $(DESTDIR)$(libdir)/$(FFTV_X11) + install -m 644 fftv_xkey.map $(DESTDIR)$(FFTV_X11) clean: rm -f *~ lirc/*~ --- Makefile.o 2005-03-01 10:41:53 +0300 +++ fftv/conf/Makefile 2005-03-01 10:42:08 +0300 @@ -3,7 +3,7 @@ all: install: - install -d $(FFTV_CONF) - install -m 644 conf-radio conf-tv codecs-radio codecs-tv $(FFTV_CONF) + install -d $(DESTDIR)$(FFTV_CONF) + install -m 644 conf-radio conf-tv codecs-radio codecs-tv $(DESTDIR)$(FFTV_CONF) clean: rm -f *~ --- Makefile.o 2005-03-01 10:40:33 +0300 +++ fftv/Makefile 2005-03-01 10:41:34 +0300 @@ -78,12 +78,12 @@ $(CC) $(OBJS_REM) -o $@ install: - install -d $(bindir) - install -s reminder $(bindir) - cd $(bindir); rm -f fftv ffradio ffrecord; ln -s ffmpeg$(EXESUF) fftv; ln -s ffmpeg$(EXESUF) ffradio ; ln -s reminder ffrecord - install -d $(FFTV_X11) - install -d $(FFTV_ICON) - install icons/* $(FFTV_ICON) + install -d $(DESTDIR)$(bindir) + install -s reminder $(DESTDIR)$(bindir) + cd $(DESTDIR)$(bindir); rm -f fftv ffradio ffrecord; ln -s ffmpeg$(EXESUF) fftv; ln -s ffmpeg$(EXESUF) ffradio ; ln -s reminder ffrecord + install -d $(DESTDIR)$(FFTV_X11) + install -d $(DESTDIR)$(FFTV_ICON) + install icons/* $(DESTDIR)$(FFTV_ICON) make -C conf install make -C key-map install if [ $(prefix) = /usr/local ]; then \ @@ -91,9 +91,9 @@ install -m 644 menu/* /usr/lib/menu; \ update-menus; \ else \ - install -d $(libdir)/menu; \ - install -m 644 menu/* $(libdir)/menu; \ - install -m 644 icons/fftv.png $(datadir)/icons/fftv.png; \ + install -d $(DESTDIR)$(libdir)/menu; \ + install -m 644 menu/* $(DESTDIR)$(libdir)/menu; \ + install -m 644 icons/fftv.png $(DESTDIR)$(datadir)/icons/fftv.png; \ fi clean: --- Makefile.o 2005-03-01 10:37:03 +0300 +++ Makefile 2005-03-01 10:39:40 +0300 @@ -127,8 +127,8 @@ install: all install-man $(INSTALLVHOOK) install-fftv $(MAKE) -C libavcodec install $(MAKE) -C libavformat install - install -d "$(bindir)" - install -c -s -m 755 $(PROG) "$(bindir)" + install -d $(DESTDIR)"$(bindir)" + install -c -s -m 755 $(PROG) $(DESTDIR)"$(bindir)" # create the window installer wininstaller: all install @@ -138,20 +138,20 @@ install-man: ifneq ($(CONFIG_WIN32),yes) if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \ - install -d $(mandir)/man1 ; \ + install -d $(DESTDIR)$(mandir)/man1 ; \ install -m 644 $(SRC_PATH)/doc/ffmpeg.1 $(SRC_PATH)/doc/ffplay.1 \ - $(SRC_PATH)/doc/ffserver.1 $(mandir)/man1 ; \ + $(SRC_PATH)/doc/ffserver.1 $(DESTDIR)$(mandir)/man1 ; \ fi endif -install-vhook: $(prefix)/lib/vhook - $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook +install-vhook: $(DESTDIR)$(prefix)/lib/vhook + $(MAKE) -C vhook install INSTDIR=$(DESTDIR)$(prefix)/lib/vhook install-fftv: $(MAKE) -C fftv install -$(prefix)/lib/vhook: +$(DESTDIR)$(prefix)/lib/vhook: install -d $@ installlib: