vdr/vdr/debian changelog rules

[Thomas Schmidt]

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

Modified Files:
	changelog rules 
Log Message:
make it possible to specify cfg-dir at build-time,
cleaned up debian/rules a little bit

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- changelog	24 Apr 2004 18:46:51 -0000	1.8
+++ changelog	1 May 2004 13:11:15 -0000	1.9
@@ -1,6 +1,7 @@
 vdr (1.2.6-4) unstable; urgency=low
 
   * Thomas Schmidt
+    - Acknowledge NMU (Closes: #238395)
     - Use dpatch, so build-depend on dpatch
     - Build-Depend on: dvb-dev | linux-kernel-headers
     - Separate plugins from the vdr-package (new packages: 
@@ -10,7 +11,8 @@
     - Cleaned up some parts to avoid lintian warnings and errors
     - Use makedev for device-generation in postinst, therefore 
       depend on makedev
-    - Changed DH_COMPAT in debian/rules to 4, to avoid lintian warning
+    - Add an option to vdr, to specify the cfg-dir at build-time,
+      and set this to /etc/vdr (Closes: Bug#233647)
 
   * Tobias Grimm <vdr@e-tobi.net>
     - added automatic loading of plugins in init script from c't vdr

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/rules,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rules	24 Apr 2004 18:46:51 -0000	1.11
+++ rules	1 May 2004 13:11:15 -0000	1.12
@@ -8,8 +8,10 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
-# export the videodir 
-export VIDEODIR=/var/lib/video
+CFGDIR    := /etc/vdr
+DVBDIR    := /usr/include
+PLUGINDIR := /usr/lib/vdr/plugins
+VIDEODIR  := /var/lib/video
 
 # include dpatch stuff
 include /usr/share/dpatch/dpatch.make
@@ -35,22 +37,22 @@
 	# Add here commands to compile the package.
 	
 	# vdr-kbd
-	$(MAKE) VIDEODIR=/var/lib/video VFAT=1 DVBDIR=/usr/include PLUGINDIR=/usr/lib/vdr/plugins PLUGINLIBDIR=/usr/lib/vdr/plugins
+	$(MAKE) VIDEODIR=$(VIDEODIR) VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
 	cp vdr vdr-kbd
 	make clean
 	
 	# vdr-daemon
-	$(MAKE) VIDEODIR=/var/lib/video NO_KBD=1 VFAT=1 DVBDIR=/usr/include PLUGINDIR=/usr/lib/vdr/plugins PLUGINLIBDIR=/usr/lib/vdr/plugins 
+	$(MAKE) VIDEODIR=$(VIDEODIR) NO_KBD=1 VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
 	cp vdr vdr-daemon
 	make clean
 	
 	# vdr-lirc
-	$(MAKE) VIDEODIR=/var/lib/video REMOTE=LIRC VFAT=1 DVBDIR=/usr/include PLUGINDIR=/usr/lib/vdr/plugins PLUGINLIBDIR=/usr/lib/vdr/plugins
+	$(MAKE) VIDEODIR=$(VIDEODIR) REMOTE=LIRC VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
 	cp vdr vdr-lirc
 	make clean
 	
 	# vdr-rcu
-	$(MAKE) VIDEODIR=/var/lib/video REMOTE=RCU VFAT=1 DVBDIR=/usr/include PLUGINDIR=/usr/lib/vdr/plugins PLUGINLIBDIR=/usr/lib/vdr/plugins
+	$(MAKE) VIDEODIR=$(VIDEODIR) REMOTE=RCU VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
 	cp vdr vdr-rcu
 
 	make include-dir