Merge branch 'master' of git+ssh://gandalf/srv/git/epgsearch

2 files changed, 7 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)
diff --git a/uservars.h b/uservars.h
index f098750..9366af0 100644
--- a/uservars.h
+++ b/uservars.h
@@ -538,7 +538,11 @@ class cVideodirVar : public cInternalVar {
     cVideodirVar() : cInternalVar("videodir") {}
     string Evaluate(const cEvent*, bool escapeStrings = false)
 	{
+#if APIVERSNUM > 20101
+	    return cVideoDirectory::Name();
+#else
 	    return VideoDirectory;
+#endif
 	}
 };