From 28441aded5649e2650b9346f42d559768295651c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Thu, 27 Dec 2012 11:58:09 +0100
Subject: DVBDIR is now conveyed to plugins via the CFLAGS; removed some
 redundancy from Make.config.template

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ccc74af5..2adb203e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.37 2012/12/26 10:55:01 kls Exp $
+# $Id: Makefile 2.38 2012/12/27 11:28:21 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -17,7 +17,6 @@ CXX      ?= g++
 CXXFLAGS ?= $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
 
 CFLAGS   += -fPIC
-CXXFLAGS += -fPIC
 
 CDEFINES  = -D_GNU_SOURCE
 CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
@@ -49,6 +48,10 @@ PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --vari
 
 -include Make.config
 
+ifdef DVBDIR
+CFLAGS += -I$(DVBDIR)/include
+endif
+
 SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
-- 
cgit v1.2.3