From 482f00455f0b0e08e3fffc844c865e43c80df84b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Apr 2020 21:16:06 +0000 Subject: [PATCH] meson.build use own configuration directories This allows for installing wf-shell into a prefix other than Wayfire's, while preserving the original behaviour by default. --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 8ce0d031..c1faf03c 100644 --- a/meson.build +++ b/meson.build @@ -32,15 +32,15 @@ libinotify = dependency('libinotify', required: needs_libinotify) add_project_arguments(['-Wno-pedantic', '-Wno-unused-parameter', '-Wno-parentheses'], language: 'cpp') -metadata_dir = join_paths(wayfire.get_variable(pkgconfig: 'metadatadir'), 'wf-shell') -sysconf_dir = wayfire.get_variable(pkgconfig: 'sysconfdir') +resource_dir = join_paths(get_option('prefix'), 'share', 'wayfire') +metadata_dir = join_paths(resource_dir, 'metadata', 'wf-shell') +sysconf_dir = join_paths(get_option('prefix'), get_option('sysconfdir')) icon_dir = join_paths(get_option('prefix'), 'share', 'wayfire', 'icons') add_project_arguments('-DICONDIR="' + icon_dir + '"', language : 'cpp') add_project_arguments('-DMETADATA_DIR="' + metadata_dir + '"', language : 'cpp') add_project_arguments('-DSYSCONF_DIR="' + sysconf_dir + '"', language : 'cpp') -resource_dir = join_paths(get_option('prefix'), 'share', 'wayfire') subdir('metadata') subdir('proto') subdir('data')