Skip to content

Commit 12435d0

Browse files
authored
Merge pull request #53 from alyssais/prefix
meson.build use own configuration directories
2 parents 27845c9 + 482f004 commit 12435d0

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ libinotify = dependency('libinotify', required: needs_libinotify)
3232

3333
add_project_arguments(['-Wno-pedantic', '-Wno-unused-parameter', '-Wno-parentheses'], language: 'cpp')
3434

35-
metadata_dir = join_paths(wayfire.get_variable(pkgconfig: 'metadatadir'), 'wf-shell')
36-
sysconf_dir = wayfire.get_variable(pkgconfig: 'sysconfdir')
35+
resource_dir = join_paths(get_option('prefix'), 'share', 'wayfire')
36+
metadata_dir = join_paths(resource_dir, 'metadata', 'wf-shell')
37+
sysconf_dir = join_paths(get_option('prefix'), get_option('sysconfdir'))
3738

3839
icon_dir = join_paths(get_option('prefix'), 'share', 'wayfire', 'icons')
3940
add_project_arguments('-DICONDIR="' + icon_dir + '"', language : 'cpp')
4041
add_project_arguments('-DMETADATA_DIR="' + metadata_dir + '"', language : 'cpp')
4142
add_project_arguments('-DSYSCONF_DIR="' + sysconf_dir + '"', language : 'cpp')
4243

43-
resource_dir = join_paths(get_option('prefix'), 'share', 'wayfire')
4444
subdir('metadata')
4545
subdir('proto')
4646
subdir('data')

0 commit comments

Comments
 (0)