summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2018-09-29 08:43:22 -0400
committerRay Strode <rstrode@redhat.com>2018-09-29 08:53:52 -0400
commit50cb6147a8d4146cf914e27d2ae84e0092b74ac0 (patch)
tree5ecb1a03e3b11e5113d116ff45e17c20e70dfa9e
parent4a07e3f83fbccd1cd84d40873435aefb53d0d03d (diff)
downloadaccountsservice-50cb6147a8d4146cf914e27d2ae84e0092b74ac0.tar.gz
meson: more naming build confusion
Closes https://gitlab.freedesktop.org/accountsservice/accountsservice/issues/54
-rw-r--r--meson.build2
-rw-r--r--src/meson.build4
2 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index dbc2e0f..af01236 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project(
meson_version: '>= 0.46.0',
)
-act_name = meson.project_name().to_lower()
+act_name = meson.project_name()
act_version = meson.project_version()
act_api_version = '1.0'
diff --git a/src/meson.build b/src/meson.build
index 3c8e7fe..20d5276 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,8 +26,8 @@ deps = [
cflags = [
'-DLOCALSTATEDIR="@0@"'.format(act_localstatedir),
'-DDATADIR="@0@"'.format(act_datadir),
- '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', meson.project_name(), 'icons')),
- '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', meson.project_name(), 'users')),
+ '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'icons')),
+ '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'users')),
]
libaccounts_generated = static_library(