summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--Makefile6
3 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2bf22521..d345409c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1892,6 +1892,7 @@ Ville Skyttä <ville.skytta@iki.fi>
for making 'dist' target dependent on up to date *.po
for adding Language and fixing Language-Team header of *.po
for fixing the Language header of the Serbian translation file
+ for using pkg-config to get fribidi cflags and libs
Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 8c26a523..7b9b1512 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6600,3 +6600,4 @@ Video Disk Recorder Revision History
Andreas Regel).
- Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel).
- Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).
+- Now using pkg-config to get fribidi cflags and libs (thanks to Ville Skyttä).
diff --git a/Makefile b/Makefile
index e84849bf..30a72b8c 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.14 2011/02/27 09:59:11 kls Exp $
+# $Id: Makefile 2.15 2011/04/17 13:26:02 kls Exp $
.DELETE_ON_ERROR:
@@ -54,9 +54,9 @@ ifdef VDR_USER
DEFINES += -DVDR_USER=\"$(VDR_USER)\"
endif
ifdef BIDI
-INCLUDES += -I/usr/include/fribidi
+INCLUDES += $(shell pkg-config --cflags fribidi)
DEFINES += -DBIDI
-LIBS += -lfribidi
+LIBS += $(shell pkg-config --libs fribidi)
endif
LIRC_DEVICE ?= /dev/lircd