diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2021-01-02 15:22:42 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2021-01-02 15:22:42 +0100 |
| commit | 163945045d5474dbf54a2c96e84450f4d2e56d15 (patch) | |
| tree | 28464a94b20a51047aa60170ac15297f03e9620b | |
| parent | 5f1e08f606d3e2b136edb8e1a241f674e03deedc (diff) | |
| download | vdr-163945045d5474dbf54a2c96e84450f4d2e56d15.tar.gz vdr-163945045d5474dbf54a2c96e84450f4d2e56d15.tar.bz2 | |
Fixed handling $(PKG_CONFIG) in newplugin
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rwxr-xr-x | newplugin | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index b983bf74..72837314 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2773,6 +2773,7 @@ Winfried Köhler <w_koehl@gmx.de> for adding initialization of cDvbFrontend::frontendInfo for improving handling missing VDRPluginDestroyer() for fixing a compiler warning + for fixing handling $(PKG_CONFIG) in newplugin Hans-Werner Hilse <hilse@web.de> for adding the command line option --userdump to enable core dumps in case VDR @@ -9570,3 +9570,4 @@ Video Disk Recorder Revision History Makefile now makes sure it is set before calling doxygen. - Fixed a crash in the SVDRP command CLRE in case a non-existing channel number is given (reported by Manuel Reimer). +- Fixed handling $(PKG_CONFIG) in newplugin (thanks to Winfried Köhler). @@ -12,7 +12,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: newplugin 4.4 2020/06/22 15:08:46 kls Exp $ +# $Id: newplugin 4.4.1.1 2021/01/02 15:22:42 kls Exp $ $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n"; @@ -76,7 +76,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ # Use package data if installed...otherwise assume we're under the VDR source directory: 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)) +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) |