summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2019-10-30 07:49:08 (GMT)
committerhorchi <vdr@jwendel.de>2019-10-30 07:49:08 (GMT)
commitf9c8dd36d36efa145806f7bef97b46382a5442f3 (patch)
tree4897bfae50156d08dd308dbdc552b3a75fa84e6e
parenteaaaa7bbef546c987364cf83e6432f007e643787 (diff)
downloadvdr-plugin-epg2vdr-f9c8dd36d36efa145806f7bef97b46382a5442f3.tar.gz
vdr-plugin-epg2vdr-f9c8dd36d36efa145806f7bef97b46382a5442f3.tar.bz2
2019-10-30 version 1.1.101 (horchi)\n - change: Added evaluation of PKG_CONFIG_PATH environment variable (thaks to kfb77@vdr-portal)\n\n1.1.101
-rw-r--r--HISTORY.h9
-rw-r--r--Makefile2
2 files changed, 7 insertions, 4 deletions
diff --git a/HISTORY.h b/HISTORY.h
index 51a93ee..6ba859f 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
*
*/
-#define _VERSION "1.1.100"
-#define VERSION_DATE "29.10.2019"
+#define _VERSION "1.1.101"
+#define VERSION_DATE "30.10.2019"
#define DB_API 7
@@ -19,8 +19,11 @@
/*
* ------------------------------------
+2019-10-30 version 1.1.101 (horchi)
+ - change: Added evaluation of PKG_CONFIG_PATH environment variable (thaks to kfb77@vdr-portal)
+
2019-10-29 version 1.1.100 (horchi)
- - bugfix: Added patch to fix potentially cras at end of recording (thaks to kfb77@vdr-portal)
+ - bugfix: Added patch to fix potentially crash at end of recording (thaks to kfb77@vdr-portal)
2019-10-28 version 1.1.99 (horchi)
- added: Option to keep menu on channel switch open
diff --git a/Makefile b/Makefile
index 7036cc6..1403938 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ GIT_REV = $(shell git describe --always 2>/dev/null)
### 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)