summaryrefslogtreecommitdiff
path: root/PLUGINS/src/status
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2014-01-01 13:35:13 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2014-01-01 13:35:13 +0100
commitea613e6b2651bedacce9413df0a9e3c80afb6c1c (patch)
treef18e62a541dd64e8fa30ad9259299e556bee152f /PLUGINS/src/status
parent16dd077fb2d9f2a352e14039cea43ebe0ffb6048 (diff)
downloadvdr-ea613e6b2651bedacce9413df0a9e3c80afb6c1c.tar.gz
vdr-ea613e6b2651bedacce9413df0a9e3c80afb6c1c.tar.bz2
Avoiding unnecessary pkg-config warnings in plugin Makefiles
Diffstat (limited to 'PLUGINS/src/status')
-rw-r--r--PLUGINS/src/status/HISTORY4
-rw-r--r--PLUGINS/src/status/Makefile4
-rw-r--r--PLUGINS/src/status/status.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index bbf2c69b..7a808422 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -60,3 +60,7 @@ VDR Plugin 'status' Revision History
2013-03-31: Version 2.0.0
- Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 8f6e26f6..40a0351e 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 2.15 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -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)
PLGCFG = $(call PKGCFG,plgcfg)
#
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index e9e3ae7d..d9e43d16 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: status.c 2.4 2013/03/31 09:30:18 kls Exp $
+ * $Id: status.c 3.1 2014/01/01 13:29:54 kls Exp $
*/
#include <vdr/plugin.h>
#include <vdr/status.h>
-static const char *VERSION = "2.0.0";
+static const char *VERSION = "2.1.1";
static const char *DESCRIPTION = "Status monitor test";
static const char *MAINMENUENTRY = NULL;