From f5dba03447fa73da6e181ead7fb98c2b0a2fed41 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 22 Jun 2020 15:08:46 +0200 Subject: Made the call to pkg_config configurable via the PKG_CONFIG macro, which is necessary for cross-building VDR --- newplugin | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'newplugin') diff --git a/newplugin b/newplugin index 2e953938..e51d45cb 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 4.3 2017/05/29 08:55:21 kls Exp $ +# $Id: newplugin 4.4 2020/06/22 15:08:46 kls Exp $ $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin \n"; @@ -75,7 +75,8 @@ 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_PATH="\$\$PKG_CONFIG_PATH:../../.." pkg-config --variable=\$(1) vdr)) +PKG_CONFIG ?= pkg-config +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) -- cgit v1.2.3