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

Include paths are now added instead of overwriting INCLUDES in the Makefile

This commit is contained in:
Klaus Schmidinger 2010-04-10 12:44:01 +02:00
parent 123bd2fec0
commit 5a67f86207
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -2588,3 +2588,6 @@ Dimitar Petrovski <dimeptr@gmail.com>
Eric Valette <eric.valette@free.fr>
for adding handling of EnhancedAC3DescriptorTag
Paul Menzel <paulepanter@users.sourceforge.net>
for making include paths be added instead of overwriting INCLUDES in the Makefile

2
HISTORY
View File

@ -6430,3 +6430,5 @@ Video Disk Recorder Revision History
there is less than MIN_TS_PACKETS_FOR_FRAME_DETECTOR left (reported by Derek Kelly).
- Added a note about not deleting cDeviceHook objects to device.h.
- Added user defined key kUser0 (suggested by Ulf Kiener).
- Include paths are now added instead of overwriting INCLUDES in the Makefile (thanks
to Paul Menzel).

4
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Makefile 2.8 2010/02/21 11:44:38 kls Exp $
# $Id: Makefile 2.9 2010/04/10 12:40:15 kls Exp $
.DELETE_ON_ERROR:
@ -21,7 +21,7 @@ MANDIR = $(PREFIX)/share/man
BINDIR = $(PREFIX)/bin
LOCDIR = ./locale
LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
INCLUDES = -I/usr/include/freetype2
INCLUDES ?= -I/usr/include/freetype2
PLUGINDIR= ./PLUGINS
PLUGINLIBDIR= $(PLUGINDIR)/lib