diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2021-01-02 14:32:20 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2021-01-02 14:32:20 +0100 |
| commit | be9eff0fade6c434cfe03f731e51b0b88a67d9fd (patch) | |
| tree | 80243cd1fe3674b3c60fd63f48c4dc488406b784 | |
| parent | 3f3e47d28032991c4e9f02ef54c21cb5ec196b47 (diff) | |
| download | vdr-be9eff0fade6c434cfe03f731e51b0b88a67d9fd.tar.gz vdr-be9eff0fade6c434cfe03f731e51b0b88a67d9fd.tar.bz2 | |
Fixed handling $(PKG_CONFIG) in newplugin
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rwxr-xr-x | newplugin | 4 |
3 files changed, 5 insertions, 3 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 @@ -9569,7 +9569,7 @@ Video Disk Recorder Revision History - Events in the past are no longer marked as having a timer in the Schedules menu. -2021-01-01: +2021-01-02: - Fixed strreplace() to handle NULL strings (reported by Jürgen Schneider). - Somewhere down the road the 'x' bit of Doxyfile.filter got lost, so the @@ -9577,3 +9577,4 @@ Video Disk Recorder Revision History - Using strgetlast() in more places. - 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 5.1 2021/01/02 14:32:20 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) |