diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9ec58b5f..b6234d2e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -547,6 +547,7 @@ Helmut Auer for suggesting to add cChannel::LinkChannels() and cChannel::RefChannel() for suggesting to give a message when an instant recording is started fpr suggesting to retry a shutdown after a while + for separating the 'install' target into several individual targets Jeremy Hall for fixing an incomplete initialization of the filter parameters in eit.c diff --git a/HISTORY b/HISTORY index 2cb40b53..62ab4db6 100644 --- a/HISTORY +++ b/HISTORY @@ -4268,3 +4268,5 @@ Video Disk Recorder Revision History so that the first WhatsOn menu will come up faster. - If a shutdown is requested, but the shutdown script doesn't actually halt the system, it is now tried again after 5 minutes (suggested by Helmut Auer). +- Separated the 'install' target into several individual targets; renamed the + 'plugins-install' target to 'install-plugins' (thanks to Helmut Auer). diff --git a/Makefile b/Makefile index f1b61e78..a6427518 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 1.83 2006/01/13 16:04:56 kls Exp $ +# $Id: Makefile 1.84 2006/01/29 14:50:34 kls Exp $ .DELETE_ON_ERROR: @@ -199,19 +199,33 @@ plugins-clean: # Install the files: -install: +install: install-bin install-conf install-doc install-plugins + +# VDR binary: + +install-bin: vdr @mkdir -p $(BINDIR) @cp vdr runvdr $(BINDIR) + +# Configuration files: + +install-conf: + @if [ ! -d $(VIDEODIR) ]; then\ + mkdir -p $(VIDEODIR);\ + cp *.conf $(VIDEODIR);\ + fi + +# Documentation: + +install-doc: @mkdir -p $(MANDIR)/man1 @mkdir -p $(MANDIR)/man5 @gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz @gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz - @if [ ! -d $(VIDEODIR) ]; then\ - mkdir -p $(VIDEODIR);\ - cp *.conf $(VIDEODIR);\ - fi -plugins-install: +# Plugins: + +install-plugins: plugins @mkdir -p $(PLUGINLIBDIR) @cp $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION) $(PLUGINLIBDIR)