diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2016-06-12 20:21:17 +0200 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2016-06-12 20:21:17 +0200 |
| commit | 744d037a18348e4fc59612e41b9cdfcb5ec00565 (patch) | |
| tree | 29dd6096335aa55193849d4644cf4a38d7bc9be8 | |
| parent | Bumped to version 2.7.5 (diff) | |
| download | gentoo-vdr-scripts-744d037a18348e4fc59612e41b9cdfcb5ec00565.tar.gz gentoo-vdr-scripts-744d037a18348e4fc59612e41b9cdfcb5ec00565.tar.bz2 gentoo-vdr-scripts-744d037a18348e4fc59612e41b9cdfcb5ec00565.zip | |
rewritten plugin_dir detection, as the old test failed under arch arm64;
thanks to Thomas Reufer to point this out
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | usr/share/vdr/inc/plugin-functions.sh | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -1,6 +1,11 @@ # ChangeLog for gentoo-vdr-scripts # $Id$ + 12 Jun 2016; Joerg Bornkessel <hd_brummy@gentoo.org> + usr/share/vdr/inc/plugin-functions.sh: + rewritten plugin_dir detection, as the old test failed under arch arm64; + thanks to Thomas Reufer to point this out + *gentoo-vdr-scripts-2.7.5 (01 May 2016) *gentoo-vdr-scripts-2.7.4 (01 May 2016) diff --git a/usr/share/vdr/inc/plugin-functions.sh b/usr/share/vdr/inc/plugin-functions.sh index e271fe6..b2b3974 100644 --- a/usr/share/vdr/inc/plugin-functions.sh +++ b/usr/share/vdr/inc/plugin-functions.sh @@ -74,12 +74,8 @@ init_plugin_loader() { } prepare_plugin_checks() { - # find plugin dir, needed for multilib ... - local include_dir=/usr/include/vdr - plugin_dir="$(awk '/^PLUGINLIBDIR/{ print $3 }' ${include_dir}/Make.config)" - if [ -n "${plugin_dir}" ]; then - plugin_dir=/usr/lib/vdr/plugins - fi + # find plugin lib dir, needed for multilib ... + plugin_dir=$(pkg-config --variable=libdir vdr) # needed for plugin patchlevel check vdr_checksum_dir="${plugin_dir%/plugins}/checksums" |