Skip to content

Commit

Permalink
Merge pull request #53 from alyssais/prefix
Browse files Browse the repository at this point in the history
meson.build use own configuration directories
  • Loading branch information
ammen99 authored Jul 19, 2020
2 parents 27845c9 + 482f004 commit 12435d0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 12435d0

Please sign in to comment.