[gimp/meson: 72/128] Add prefix to share/, lib/ relpaths
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 72/128] Add prefix to share/, lib/ relpaths
- Date: Mon, 12 Feb 2018 13:45:51 +0000 (UTC)
commit 1307431597256c7a94d3b4e3253c60fcd252dd99
Author: Félix Piédallu <felix piedallu me>
Date: Tue Jan 9 10:47:21 2018 +0100
Add prefix to share/, lib/ relpaths
app/config/meson.build | 2 +-
docs/meson.build | 8 ++++----
meson.build | 34 ++++++++++++++++++----------------
plug-ins/gimpressionist/meson.build | 4 ++--
plug-ins/gradient-flare/meson.build | 2 +-
plug-ins/help/meson.build | 2 +-
6 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/app/config/meson.build b/app/config/meson.build
index 7b99780..4e01afa 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -32,7 +32,7 @@ libappconfig = static_library('appconfig',
c_args: [
'-DG_LOG_DOMAIN="Gimp-Config"',
'-DGIMP_APP_VERSION_STRING="'+ app_version +'"',
- '-DDATADIR="'+ gimpdatadir +'"',
+ '-DDATADIR="'+ join_paths(prefix, gimpdatadir) +'"',
],
dependencies: [
cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2,
diff --git a/docs/meson.build b/docs/meson.build
index 4a4d2eb..7b2bae1 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -2,11 +2,11 @@
# Configure_file is just here to rename the files
manconf = configuration_data()
manconf.set('GIMP_VERSION', app_version)
-manconf.set('gimpdatadir', gimpdatadir)
-manconf.set('gimplocaledir', localedir)
-manconf.set('gimpplugindir', gimpplugindir)
+manconf.set('gimpdatadir', join_paths(prefix, gimpdatadir))
+manconf.set('gimplocaledir', join_paths(prefix, localedir))
+manconf.set('gimpplugindir', join_paths(prefix, gimpplugindir))
+manconf.set('manpage_gimpdir',join_paths(prefix, gimpmanpagedir))
manconf.set('gimpsysconfdir', gimpsysconfdir)
-manconf.set('manpage_gimpdir',gimpmanpagedir)
man_files = [
configure_file(
diff --git a/meson.build b/meson.build
index 9d5df20..e2faf84 100644
--- a/meson.build
+++ b/meson.build
@@ -633,7 +633,7 @@ gimpdatadir = join_paths(get_option('datadir'), meson.project_name(), api_
gimpplugindir = join_paths(get_option('libdir'), meson.project_name(), api_version)
gimpsysconfdir = join_paths(get_option('sysconfdir'), meson.project_name(), api_version)
gimpmanpagedir = gimpdir
-localedir = join_paths(get_option('datadir'), 'locale')
+localedir = join_paths(get_option('datadir'), 'locale')
@@ -791,18 +791,20 @@ has_nl_measurement = cc.has_function(
# Set/regroup common CFlags for subdirs
libgimp_cflags = [
- '-DPREFIX="'+ prefix + '"',
- '-DGIMPDIR="'+ gimpdir + '"',
- '-DPACKAGE_STRING="'+ package_string + '"',
- '-DDATADIR="'+ gimpdatadir + '"',
- '-DLOCALEDIR="'+ localedir + '"',
- '-DPLUGINDIR="'+ gimpplugindir + '"',
- '-DSYSCONFDIR="'+ gimpsysconfdir + '"',
- '-DGIMP_PACKAGE="'+ meson.project_name() + '"',
- '-DGIMP_DATA_VERSION="'+ api_version + '"',
- '-DGIMP_USER_VERSION="'+ user_version + '"',
- '-DGIMP_SYSCONF_VERSION="'+ api_version + '"',
- '-DGIMP_PLUGIN_VERSION="'+ api_version + '"',
+ '-DGIMP_PACKAGE=' +'"'+ meson.project_name() +'"',
+ '-DPACKAGE_STRING=' +'"'+ package_string +'"',
+
+ '-DGIMP_DATA_VERSION=' +'"'+ api_version +'"',
+ '-DGIMP_USER_VERSION=' +'"'+ user_version +'"',
+ '-DGIMP_SYSCONF_VERSION=' +'"'+ api_version +'"',
+ '-DGIMP_PLUGIN_VERSION=' +'"'+ api_version +'"',
+
+ '-DPREFIX=' +'"'+ prefix +'"',
+ '-DGIMPDIR=' +'"'+ gimpdir +'"',
+ '-DDATADIR=' +'"'+ join_paths(prefix, gimpdatadir) +'"',
+ '-DLOCALEDIR=' +'"'+ join_paths(prefix, localedir) +'"',
+ '-DPLUGINDIR=' +'"'+ join_paths(prefix, gimpplugindir) +'"',
+ '-DSYSCONFDIR=' +'"'+ gimpsysconfdir +'"',
]
libgimp_lflags = []
@@ -902,10 +904,10 @@ pkgconfig.generate(filebase: 'gimp-' + api_version,
gimp_api_name,
],
variables: [
- 'gimpdatadir=' + gimpdatadir,
- 'gimplibdir=' + gimpplugindir,
+ 'gimpdatadir=' +'${prefix}/'+ gimpdatadir,
+ 'gimplibdir=' +'${prefix}/'+ gimpplugindir,
'gimpsysconfdir=' + gimpsysconfdir,
- 'gimplocaledir=' + localedir,
+ 'gimplocaledir=' +'${prefix}/'+ localedir,
],
)
pkgconfig.generate(filebase: 'gimpthumb-' + api_version,
diff --git a/plug-ins/gimpressionist/meson.build b/plug-ins/gimpressionist/meson.build
index 3456bd1..54bd645 100644
--- a/plug-ins/gimpressionist/meson.build
+++ b/plug-ins/gimpressionist/meson.build
@@ -35,8 +35,8 @@ gimpressionist = executable('gimpressionist',
libgimpwidgets,
],
c_args: [
- '-DDEFAULTPATH="' + join_paths('~/', gimpdir, 'gimpressionist')
- + ':' + join_paths(gimpdatadir, 'gimpressionist')
+ '-DDEFAULTPATH="' + join_paths('~/', gimpdir, 'gimpressionist')
+ + ':' + join_paths(prefix,gimpdatadir,'gimpressionist')
+ '"',
],
install: true,
diff --git a/plug-ins/gradient-flare/meson.build b/plug-ins/gradient-flare/meson.build
index fa7d97d..0808f04 100644
--- a/plug-ins/gradient-flare/meson.build
+++ b/plug-ins/gradient-flare/meson.build
@@ -18,7 +18,7 @@ gradient_flare = executable('gradient-flare',
libgimpwidgets,
],
c_args: [
- '-DDATADIR="' + gimpdatadir + '"',
+ '-DDATADIR="' + join_paths(prefix, gimpdatadir) + '"',
],
install: true,
install_dir: join_paths(gimpplugindir, 'plug-ins'),
diff --git a/plug-ins/help/meson.build b/plug-ins/help/meson.build
index f575eb7..b160738 100644
--- a/plug-ins/help/meson.build
+++ b/plug-ins/help/meson.build
@@ -23,7 +23,7 @@ help = executable('help',
libgimpwidgets,
],
c_args: [
- '-DDATADIR="' + gimpdatadir + '"',
+ '-DDATADIR="' + join_paths(prefix, gimpdatadir) + '"',
],
install: true,
install_dir: join_paths(gimpplugindir, 'plug-ins'),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]