summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger@gmx.de>2014-12-27 17:36:46 +0100
committerChristian Wieninger <cwieninger@gmx.de>2014-12-27 17:36:46 +0100
commitf2f66b716bcb62e269aac77775bf761cd1bea730 (patch)
treec4bdc85761be162552de4811d697a70ec9f46376
parentf4231d4b56f0f899d39a011992da348a30e30429 (diff)
downloadvdr-plugin-epgsearch-f2f66b716bcb62e269aac77775bf761cd1bea730.tar.gz
vdr-plugin-epgsearch-f2f66b716bcb62e269aac77775bf761cd1bea730.tar.bz2
Makefile changes for vdr 2.1.3
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0d52b38..2ded06a 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,9 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
### The directory environment:
# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+#PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+
LIBDIR = $(call PKGCFG,libdir)
LOCDIR = $(call PKGCFG,locdir)
MANDIR = $(call PKGCFG,mandir)