[rygel] build: Fix preset and icon installation dir



commit d574e46466d2b69629cb050e27783248c9dcc8f5
Author: Jens Georg <mail jensge org>
Date:   Fri Aug 23 18:09:53 2019 +0200

    build: Fix preset and icon installation dir
    
    Fixes #144

 meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index d942532b..ec7da4fb 100644
--- a/meson.build
+++ b/meson.build
@@ -23,10 +23,10 @@ if not get_option('uninstalled')
     rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
     rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins')
     rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines')
-    rygel_presetdir = join_paths(rygel_datadir, 'rygel', 'presets')
-    rygel_icondir = join_paths(rygel_datadir, 'icons', 'hicolor')
-    rygel_bigicondir = join_paths(rygel_datadir, 'rygel', 'icons', '120x120')
-    rygel_smallicondir = join_paths(rygel_datadir, 'rygel', 'icons', '48x48')
+    rygel_presetdir = join_paths(rygel_datadir, 'presets')
+    rygel_icondir = join_paths(get_opion('prefix'), get_option('datadir'), 'icons', 'hicolor')
+    rygel_bigicondir = join_paths(rygel_datadir, 'icons', '120x120')
+    rygel_smallicondir = join_paths(rygel_datadir, 'icons', '48x48')
 else
     rygel_datadir = join_paths(meson.current_build_dir(), 'data')
     rygel_libexecdir = join_paths(meson.current_build_dir(), 'src/plugins/media-export')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]