aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--usr/share/vdr/inc/plugin-functions.sh8
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f5b191d..d1aea13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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"