vdr/vdr/debian/patches 02_Makefile-CFGDIR.dpatch 00list

[Thomas Schmidt]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches
In directory haydn:/tmp/cvs-serv27628/vdr/vdr/debian/patches

Modified Files:
	00list 
Added Files:
	02_Makefile-CFGDIR.dpatch 
Log Message:
make it possible to specify cfg-dir at build-time,
cleaned up debian/rules a little bit

Index: 00list
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/00list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 00list	24 Apr 2004 10:47:35 -0000	1.1
+++ 00list	1 May 2004 13:11:14 -0000	1.2
@@ -1 +1,2 @@
 01_vdr_1.2.6-3.1.diff.gz
+02_Makefile-CFGDIR

--- NEW FILE: 02_Makefile-CFGDIR.dpatch ---
#! /bin/sh -e
## 01_Makefile-CFGDIR.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

if [ $# -lt 1 ]; then
    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
    -patch) patch -p1 ${patch_opts} < $0;;
    -unpatch) patch -R -p1 ${patch_opts} < $0;;
    *)
        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
        exit 1;;
esac

exit 0

@DPATCH@
diff -urNad /home/chelli/vdr/test/vdr/Makefile vdr/Makefile
--- /home/chelli/vdr/test/vdr/Makefile	2003-08-09 13:09:45.000000000 +0200
+++ vdr/Makefile	2004-05-01 13:35:27.000000000 +0200
@@ -23,6 +23,7 @@
 PLUGINLIBDIR= $(PLUGINDIR)/lib
 
 VIDEODIR = /video
+CFGDIR ?= $(VIDEODIR)
 
 DOXYGEN  = /usr/bin/doxygen
 DOXYFILE = Doxyfile
@@ -51,6 +52,7 @@
 DEFINES += -D_GNU_SOURCE
 
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+DEFINES += -DCFGDIR=\"$(CFGDIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 
 ifdef DEBUG_OSD
diff -urNad /home/chelli/vdr/test/vdr/vdr.c vdr/vdr.c
--- /home/chelli/vdr/test/vdr/vdr.c	2004-04-22 12:48:59.000000000 +0200
+++ vdr/vdr.c	2004-05-01 13:36:20.000000000 +0200
@@ -340,7 +340,7 @@
   // Configuration data:
 
   if (!ConfigDirectory)
-     ConfigDirectory = VideoDirectory;
+     ConfigDirectory = CFGDIR;
 
   cPlugin::SetConfigDirectory(ConfigDirectory);