[gnome-builder/wip/tingping/meson-build] fixup! build: Add support for Meson
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/tingping/meson-build] fixup! build: Add support for Meson
- Date: Mon, 5 Dec 2016 11:10:12 +0000 (UTC)
commit 1e8b7e4b5a5e7d70e09f770455fb0d4256f2a9b5
Author: Patrick Griffis <tingping tingping se>
Date: Mon Dec 5 06:09:54 2016 -0500
fixup! build: Add support for Meson
meson.build | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index d77c39e..26d65d2 100644
--- a/meson.build
+++ b/meson.build
@@ -18,10 +18,10 @@ conf = configuration_data()
conf.set_quoted('PACKAGE_NAME', 'gnome-builder')
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
conf.set_quoted('PACKAGE_STRING', 'gnome-builder-' + meson.project_version())
-conf.set_quoted('PACKAGE_DATADIR', get_option('datadir'))
-conf.set_quoted('PACKAGE_LIBDIR', get_option('datadir'))
-conf.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('datadir'), 'locale'))
-conf.set_quoted('PACKAGE_LIBEXECDIR', get_option('libexecdir'))
+conf.set_quoted('PACKAGE_DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
+conf.set_quoted('PACKAGE_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+conf.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
+conf.set_quoted('PACKAGE_LIBEXECDIR', join_paths(get_option('prefix'), get_option('libexecdir')))
conf.set('GETTEXT_PACKAGE', 'PACKAGE_NAME')
conf.set('LOCALEDIR', 'PACKAGE_LOCALE_DIR')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]