diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | INSTALL | 23 | ||||
| -rw-r--r-- | Make.config.template | 4 | ||||
| -rw-r--r-- | Makefile | 13 |
5 files changed, 29 insertions, 14 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 40ced81a..984b7cb2 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -588,6 +588,7 @@ Lauri Tischler <lauri.tischler@efore.fi> unavailable due to a recording on a different transponder for reporting a compiler warning about virtual cConfig::Load() functions for reporting a warning about character comparison in libsi/si.c + for adjusting the Makefile to the dvb-kernel driver on kernel 2.6 and up Andy Carter <fruit@ukgateway.net> for helping to test new DVB-T handling @@ -3769,3 +3769,5 @@ Video Disk Recorder Revision History apparently some users actually need it. It's not active by default, you'll have to define the WAIT_FOR_TUNER_LOCK macro in that file if you need it (suggested by Malcolm Caldwell). +- Adjusted the Makefile to the dvb-kernel driver on kernel 2.6 and up (thanks to + Lauri Tischler). @@ -23,18 +23,21 @@ mode you want. Compiling and running the program: ---------------------------------- -Make sure the files from this package are located in a -directory that is "parallel" to the DVB directory of the -driver source for the Siemens DVB-S PCI card (refer to -http://linuxtv.org/dvb/siemens_dvb.html for more information -about that driver). For example, if the DVB driver was -extracted into the directory /home/kls/vdr/DVB, then this -package should be extracted into /home/kls/vdr/VDR. +VDR requires the Linux-DVB driver header files to compile. +As of kernel 2.6 these are part of the official Linux kernel +distribution, and VDR's Makefile will automatically locate +them. If you are using kernel 2.4 or earlier, you should +install the files from this package in a directory that is +"parallel" to the DVB directory of the driver source (refer to +http://linuxtv.org for more information about that driver). +For example, if the DVB driver was extracted into the directory +/home/kls/vdr/DVB, then this package should be extracted into +/home/kls/vdr/VDR. If you have the DVB driver source in a different location -you will have to change the definition of DVBDIR in the -Makefile (see the file Make.config.template). +you can rename the file Make.config.template to Make.config and +adjust the definition of DVBDIR in that file. -VDR requires the Linux-DVB card driver version dated 2003-08-23 or higher +VDR requires the Linux-DVB driver version dated 2003-08-23 or higher to work properly. After extracting the package, change into the VDR directory diff --git a/Make.config.template b/Make.config.template index 149ce986..5cbf42bf 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.5 2005/07/31 11:35:28 kls Exp $ +# $Id: Make.config.template 1.6 2005/09/02 14:24:31 kls Exp $ ### The C compiler and options: @@ -18,7 +18,7 @@ CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual ### The directory environment: -DVBDIR = ../DVB +#DVBDIR = ../DVB MANDIR = /usr/local/man BINDIR = /usr/local/bin @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 1.78 2005/09/02 13:37:51 kls Exp $ +# $Id: Makefile 1.79 2005/09/02 14:23:38 kls Exp $ .DELETE_ON_ERROR: @@ -14,7 +14,16 @@ CFLAGS ?= -O2 CXX ?= g++ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -DVBDIR = ../DVB +LINUX_VERSION := $(shell uname -r | cut -c-3) +LINUX := $(shell uname -r) +DVBDIR := /lib/modules/$(LINUX)/build +ifeq ($(LINUX_VERSION), 2.4) + DVBDIR = ../DVB +endif +ifeq ($(LINUX_VERSION), 2.2) + DVBDIR = ../DVB +endif + LSIDIR = ./libsi MANDIR = /usr/local/man BINDIR = /usr/local/bin |