[gimp/meson: 564/805] Fix flags (relative paths to prefix -> append with prefix)

[Félix Piédallu <fpiedallu src gnome org>]

commit 26d0b1bd3cdcb5b6070eab4e149f01664ab65e05
Author: Félix Piédallu <felix piedallu me>
Date:   Tue Jan 9 10:17:09 2018 +0100

    Fix flags (relative paths to prefix -> append with prefix)

 meson.build       |    2 +-
 tools/meson.build |   42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/meson.build b/meson.build
index 4c91648..9d5df20 100644
--- a/meson.build
+++ b/meson.build
@@ -626,7 +626,7 @@ enable_console_bin = get_option('enable-console-bin')
 gimpdir = get_option('gimpdir')
 if gimpdir == ''
   # Default value
-  gimpdir = meson.project_name()
+  gimpdir = meson.project_name().to_upper()
 endif
 
 gimpdatadir    = join_paths(get_option('datadir'),    meson.project_name(), api_version)
diff --git a/tools/meson.build b/tools/meson.build
index 3579170..fe91cde 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -6,29 +6,29 @@ endif
 
 
 tools_cflags = [
-  '-DBINDIR="'+ get_option('bindir') +'"',
-  '-DCC="'+ cc.get_id() +'"',
-  '-DDATADIR="'+ get_option('datadir') +'"',
-  '-DDATAROOTDIR="'+ get_option('datadir') +'"',
-  '-DEXEC_PREFIX="'+ prefix +'"',
-  '-DGIMP_APP_VERSION="'+ app_version +'"',
-  '-DGIMP_PLUGIN_VERSION="'+ api_version +'"',
-  '-DGIMPDATADIR="'+ gimpdatadir +'"',
-  '-DGIMPDIR="'+ gimpdir +'"',
-  '-DGIMPPLUGINDIR="'+ gimpplugindir +'"',
-  '-DINFODIR="'+ get_option('infodir') +'"',
-  '-DLIBDIR="'+ get_option('libdir') +'"',
-  '-DLIBEXECDIR="'+ get_option('libexecdir') +'"',
-  '-DLOCALEDIR="'+ localedir +'"',
-  '-DLOCALSTATEDIR="'+ get_option('localstatedir') +'"',
-  '-DMANDIR="'+ get_option('mandir') +'"',
-  '-DPREFIX="'+ prefix +'"',
-  '-DSBINDIR="'+ get_option('sbindir') +'"',
-  '-DSHAREDSTATEDIR="'+ get_option('sharedstatedir') +'"',
-  '-DSYSCONFDIR="'+ gimpsysconfdir +'"',
-]
+  '-DGIMP_APP_VERSION='    +'"'+ app_version                                    +'"',
+  '-DGIMP_PLUGIN_VERSION=' +'"'+ api_version                                    +'"',
 
+  '-DCC='                  +'"'+ cc.get_id()                                    +'"',
 
+  '-DPREFIX='              +'"'+ prefix                                         +'"',
+  '-DEXEC_PREFIX='         +'"'+ prefix                                         +'"',
+  '-DBINDIR='              +'"'+ join_paths(prefix, get_option('bindir'))       +'"',
+  '-DDATADIR='             +'"'+ join_paths(prefix, get_option('datadir'))      +'"',
+  '-DDATAROOTDIR='         +'"'+ join_paths(prefix, get_option('datadir'))      +'"',
+  '-DGIMPDATADIR='         +'"'+ join_paths(prefix, gimpdatadir)                +'"',
+  '-DGIMPDIR='             +'"'+ gimpdir                                        +'"',
+  '-DGIMPPLUGINDIR='       +'"'+ join_paths(prefix, gimpplugindir)              +'"',
+  '-DINFODIR='             +'"'+ join_paths(prefix, get_option('infodir'))      +'"',
+  '-DLIBDIR='              +'"'+ join_paths(prefix, get_option('libdir'))       +'"',
+  '-DLIBEXECDIR='          +'"'+ join_paths(prefix, get_option('libexecdir'))   +'"',
+  '-DLOCALEDIR='           +'"'+ join_paths(prefix, localedir)                  +'"',
+  '-DMANDIR='              +'"'+ join_paths(prefix, get_option('mandir'))       +'"',
+  '-DSBINDIR='             +'"'+ join_paths(prefix, get_option('sbindir'))      +'"',
+  '-DLOCALSTATEDIR='       +'"'+ get_option('localstatedir')                    +'"',
+  '-DSHAREDSTATEDIR='      +'"'+ get_option('sharedstatedir')                   +'"', # HUH ? /usr/com
+  '-DSYSCONFDIR='          +'"'+ get_option('sysconfdir')                       +'"',
+]
 
 
 gimptool = executable('gimptool-2.0',