summaryrefslogtreecommitdiff
path: root/newplugin
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 /newplugin
parent16dd077fb2d9f2a352e14039cea43ebe0ffb6048 (diff)
downloadvdr-ea613e6b2651bedacce9413df0a9e3c80afb6c1c.tar.gz
vdr-ea613e6b2651bedacce9413df0a9e3c80afb6c1c.tar.bz2
Avoiding unnecessary pkg-config warnings in plugin Makefiles
Diffstat (limited to 'newplugin')
-rwxr-xr-xnewplugin4
1 files changed, 2 insertions, 2 deletions
diff --git a/newplugin b/newplugin
index 150649c5..8f7087e9 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: newplugin 3.1 2013/05/02 10:06:09 kls Exp $
+# $Id: newplugin 3.2 2014/01/01 13:29:54 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@@ -75,7 +75,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
### 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)