From 26e6ba7dd7cedfa2adbae794b7d0a07edb10b308 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 29 Dec 2012 15:03:06 +0100 Subject: Removed "include" from the DVBDIR setting in the VDR Makefile --- CONTRIBUTORS | 2 ++ HISTORY | 3 +++ Makefile | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c8e032c3..a78e6130 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -691,6 +691,8 @@ Oliver Endriss for suggesting a better way of handling calls to realloc() for making the cutter set the 'broken link' flag for MPEG2 TS recordings for reporting a crash in a plugin using cDeviceHook when VDR ends + for reporting that "include" needs to be removed from the DVBDIR setting in the VDR + Makefile Reinhard Walter Buchner for adding some satellites to 'sources.conf' diff --git a/HISTORY b/HISTORY index d8e3ef0a..354959e7 100644 --- a/HISTORY +++ b/HISTORY @@ -7489,3 +7489,6 @@ Video Disk Recorder Revision History determines whether a particular plugin uses an old style Makefile and calls it accordingly. Note that this only works when building plugins from within the VDR source tree, using "make plugins" in the VDR source directory. +- Removed "include" from the DVBDIR setting in the VDR Makefile (reported by Oliver + Endriss). You may need to adjust your DVBDIR setting in Make.config, in case you + use it. diff --git a/Makefile b/Makefile index b342f55c..1be098b6 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.45 2012/12/29 11:58:32 kls Exp $ +# $Id: Makefile 2.46 2012/12/29 14:53:37 kls Exp $ .DELETE_ON_ERROR: @@ -49,7 +49,7 @@ PCDIR ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --vari -include Make.config ifdef DVBDIR -CFLAGS += -I$(DVBDIR)/include +CFLAGS += -I$(DVBDIR) endif UP3 = $(if $(findstring "$(LIBDIR)-$(LOCDIR)","$(CWD)/PLUGINS/lib-$(CWD)/locale"),../../../,) -- cgit v1.2.3