From f2f66b716bcb62e269aac77775bf761cd1bea730 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Sat, 27 Dec 2014 17:36:46 +0100 Subject: Makefile changes for vdr 2.1.3 --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3