r1391 - vdr/vdr-plugin-muggle/trunk/debian

[Thomas Günther]

Author: tom-guest
Date: 2005-10-24 21:11:50 +0000 (Mon, 24 Oct 2005)
New Revision: 1391

Modified:
   vdr/vdr-plugin-muggle/trunk/debian/changelog
   vdr/vdr-plugin-muggle/trunk/debian/rules
Log:
Adapted make options in debian/rules to new standard values in Makefile

Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog	2005-10-24 18:53:54 UTC (rev 1390)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog	2005-10-24 21:11:50 UTC (rev 1391)
@@ -6,6 +6,7 @@
     - New upstream release
     - Adapted 03_image_convert.sh-path.dpatch
     - Install mugglei to /usr/lib/vdrdevel-plugin-muggle/
+    - Adapted make options in debian/rules to new standard values in Makefile
 
  -- Thomas Günther <tom at toms-cafe.de>  Mon, 24 Oct 2005 18:46:00 +0200
 

Modified: vdr/vdr-plugin-muggle/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/rules	2005-10-24 18:53:54 UTC (rev 1390)
+++ vdr/vdr-plugin-muggle/trunk/debian/rules	2005-10-24 21:11:50 UTC (rev 1391)
@@ -29,6 +29,10 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
+               HAVE_VORBISFILE=1 HAVE_FLAC=1 HAVE_SNDFILE=1 \
+               HAVE_MYSQL=1 HAVE_ONLY_SERVER=1
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -41,8 +45,7 @@
 	# Fix changed timestamps from cvs update to prevent running of gentables
 	touch mg_tables.h
 
-	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
-	    HAVE_ONLY_SERVER=1 HAVE_VORBISFILE=1 HAVE_FLAC=1
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -50,7 +53,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean HAVE_VORBISFILE=1 HAVE_FLAC=1
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
 	dh_clean