diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2010-04-10 12:44:01 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2010-04-10 12:44:01 +0200 |
| commit | 5a67f86207d068aae612aa2a78505d9b96394e87 (patch) | |
| tree | 50c1b53b622d918df94621888d2f7e268520835d | |
| parent | 123bd2fec09d27f90e9bc67c9c41653e2fe664d2 (diff) | |
| download | vdr-5a67f86207d068aae612aa2a78505d9b96394e87.tar.gz vdr-5a67f86207d068aae612aa2a78505d9b96394e87.tar.bz2 | |
Include paths are now added instead of overwriting INCLUDES in the Makefile
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | Makefile | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 76d5865c..14f3856f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -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 @@ -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,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 |