[rhythmbox/wip/sam/meson: 287/287] Attempt to fix libpeas fail
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/wip/sam/meson: 287/287] Attempt to fix libpeas fail
- Date: Tue, 27 Oct 2020 18:01:09 +0000 (UTC)
commit a3bf301dfb4fbcc1b393fc43a401826a39188280
Author: Sam Thursfield <sam afuera me uk>
Date: Thu Oct 22 23:05:10 2020 +0200
Attempt to fix libpeas fail
I see this on load:
(rhythmbox:224622): libpeas-DEBUG: 23:03:14.982: Loading lib64/rhythmbox/plugins/*.plugin...
(rhythmbox:224622): libpeas-DEBUG: 23:03:14.982: Error opening directory “lib64/rhythmbox/plugins”:
No such file or directory
This should fix but doesn't seem to.
meson.build | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 05980e4a2..ef085216b 100644
--- a/meson.build
+++ b/meson.build
@@ -243,12 +243,12 @@ use_no_strict_aliasing = cc.has_argument('-fno-strict-aliasing')
#PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
#AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
#
-plugindir = get_option('libdir') + '/rhythmbox/plugins'
-cdata.set('PLUGINDIR', get_option('prefix') + '/' + plugindir)
+plugindir = get_option('prefix') / get_option('libdir') / 'rhythmbox/plugins'
+cdata.set('PLUGINDIR', plugindir)
-plugindatadir = get_option('datadir') + '/rhythmbox/plugins'
-cdata.set('PLUGINDATADIR', get_option('prefix') + '/' + plugindatadir)
-cdata.set('SAMPLEPLUGINDIR', get_option('libdir') + '/rhythmbox/sample-plugins')
+plugindatadir = get_option('prefix') / get_option('datadir') / 'rhythmbox/plugins'
+cdata.set('PLUGINDATADIR', plugindatadir)
+cdata.set('SAMPLEPLUGINDIR', get_option('prefix') / get_option('libdir') / 'rhythmbox/sample-plugins')
enable_python = false
if get_option('python-plugins') != 'no'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]