#! /bin/sh /usr/share/dpatch/dpatch-run
## 91_mlcd-0.0.4a-fix-INCLUDES.dpatch by Thomas Günther <tom@toms-cafe.de>
## http://toms-cafe.de/vdr/download/mlcd-0.0.4a-fix-INCLUDES.diff
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes compilation with VDR >= 1.7.13.

@DPATCH@
--- mlcd-0.0.4a/Makefile
+++ mlcd-0.0.4a/Makefile
@@ -13,14 +13,25 @@ PLUGIN = mlcd
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+
 ### The directory environment:
 
-DVBDIR = ../../../../DVB/include
 VDRDIR = ../../..
-VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+-include $(VDRDIR)/Make.global
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
 ### The version number of VDR (taken from VDR's "config.h"):
 
 VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
@@ -32,7 +43,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' 
 
@@ -40,11 +51,6 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I
 
 OBJS = $(PLUGIN).o multilcd.o 
 
-### The C++ compiler and options:
-
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
-
 ### Implicit rules:
 
 %.o: %.c