diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2003-08-09 11:09:45 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2003-08-09 11:09:45 +0200 |
| commit | 71283dbeb112e182a39a59734a5ce451934ac581 (patch) | |
| tree | 078983e981c2992eebb4e6ec32e9684d8e7962cc | |
| parent | d369eb9408763557f378498734b7c3cc234f895d (diff) | |
| download | vdr-71283dbeb112e182a39a59734a5ce451934ac581.tar.gz vdr-71283dbeb112e182a39a59734a5ce451934ac581.tar.bz2 | |
Made the plugin library directory configurable via Make.config
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | Make.config.template | 3 | ||||
| -rw-r--r-- | Makefile | 7 |
4 files changed, 9 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c9f82f61..6588b284 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -640,6 +640,7 @@ Ludwig Nussel <ludwig.nussel@web.de> for fixing handling repeat function with LIRC for reporting a problem with the LIRC remote control trying to learn keys even if it couldn't connect to the LIRC daemon + for making the plugin library directory configurable via Make.config Thomas Koch <tom@harhar.net> for his support in keeping the Premiere World channels up to date in 'channels.conf' @@ -2289,3 +2289,5 @@ Video Disk Recorder Revision History Andreas Kool). - Fixed keeping track of the current channel number when moving channels in the "Channels" menu (thanks to Mirko Günther for reporting this one). +- Made the plugin library directory configurable via Make.config (thanks to + Ludwig Nussel). diff --git a/Make.config.template b/Make.config.template index ff5946ff..b39b1f4c 100644 --- a/Make.config.template +++ b/Make.config.template @@ -6,7 +6,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Make.config.template 1.2 2003/08/02 14:25:53 kls Exp $ +# $Id: Make.config.template 1.3 2003/08/09 11:03:25 kls Exp $ ### The C compiler and options: @@ -23,4 +23,5 @@ MANDIR = /usr/local/man BINDIR = /usr/local/bin PLUGINDIR= ./PLUGINS +PLUGINLIBDIR= $(PLUGINDIR)/lib VIDEODIR = /video @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 1.57 2003/08/02 14:27:21 kls Exp $ +# $Id: Makefile 1.58 2003/08/09 11:09:45 kls Exp $ .DELETE_ON_ERROR: @@ -20,6 +20,7 @@ MANDIR = /usr/local/man BINDIR = /usr/local/bin PLUGINDIR= ./PLUGINS +PLUGINLIBDIR= $(PLUGINDIR)/lib VIDEODIR = /video @@ -50,7 +51,7 @@ DEFINES += -DREMOTE_$(REMOTE) DEFINES += -D_GNU_SOURCE DEFINES += -DVIDEODIR=\"$(VIDEODIR)\" -DEFINES += -DPLUGINDIR=\"$(PLUGINDIR)/lib\" +DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\" ifdef DEBUG_OSD DEFINES += -DDEBUG_OSD @@ -115,7 +116,7 @@ plugins: include-dir plugins-clean: @for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done - @-rm -f $(PLUGINDIR)/lib/* + @-rm -f $(PLUGINLIBDIR)/* # Install the files: |