frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed "include" from the DVBDIR setting in the VDR Makefile

This commit is contained in:
Klaus Schmidinger 2012-12-29 15:03:06 +01:00
parent 39a95018b0
commit 26e6ba7dd7
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -691,6 +691,8 @@ Oliver Endriss <o.endriss@gmx.de>
for suggesting a better way of handling calls to realloc() for suggesting a better way of handling calls to realloc()
for making the cutter set the 'broken link' flag for MPEG2 TS recordings 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 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 <rw.buchner@freenet.de> Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf' for adding some satellites to 'sources.conf'

3
HISTORY
View File

@ -7489,3 +7489,6 @@ Video Disk Recorder Revision History
determines whether a particular plugin uses an old style Makefile and calls it 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 accordingly. Note that this only works when building plugins from within the VDR
source tree, using "make plugins" in the VDR source directory. 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.

4
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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: .DELETE_ON_ERROR:
@ -49,7 +49,7 @@ PCDIR ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --vari
-include Make.config -include Make.config
ifdef DVBDIR ifdef DVBDIR
CFLAGS += -I$(DVBDIR)/include CFLAGS += -I$(DVBDIR)
endif endif
UP3 = $(if $(findstring "$(LIBDIR)-$(LOCDIR)","$(CWD)/PLUGINS/lib-$(CWD)/locale"),../../../,) UP3 = $(if $(findstring "$(LIBDIR)-$(LOCDIR)","$(CWD)/PLUGINS/lib-$(CWD)/locale"),../../../,)