From: Chris Tallon <chris@vomp.tv>
Date: Thu, 23 Jun 2016 17:20:42 +0000 (+0100)
Subject: Update Makefile as suggested in VDR 2.1.3 changes
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=df6ca3d348260fd7fe232361d2919058928d6066;p=jsonserver.git

Update Makefile as suggested in VDR 2.1.3 changes
---

diff --git a/Makefile b/Makefile
index 3000236..f9fa715 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### 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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)