[gimp/meson: 101/127] Fix translations, strings replacements.

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

commit d291dbb379e4fa88de21cf20f428c0ed306b46ac
Author: Félix Piédallu <felix piedallu me>
Date:   Thu Jan 11 10:41:24 2018 +0100

    Fix translations, strings replacements.

 data/tips/meson.build |    2 +-
 desktop/meson.build   |   35 ++++++++++++++++++++++++++---------
 docs/meson.build      |    3 ++-
 meson.build           |    2 +-
 po-tags/meson.build   |    5 +----
 po-tips/meson.build   |    1 +
 6 files changed, 32 insertions(+), 16 deletions(-)
---
diff --git a/data/tips/meson.build b/data/tips/meson.build
index daf7a5d..9544d38 100644
--- a/data/tips/meson.build
+++ b/data/tips/meson.build
@@ -10,7 +10,7 @@ gimp_tips = custom_target(xmlfilename,
     '--xml-style',
     '--utf8',
     '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
-    potags_dir,
+    potips_dir,
     '@INPUT@',
     '@OUTPUT@',
   ],
diff --git a/desktop/meson.build b/desktop/meson.build
index 470d52a..1c2800f 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -49,24 +49,41 @@ desktopfile = custom_target(desktopfilename,
 )
 
 appdatafilename = 'gimp.appdata.xml'
-appdatafile = configure_file(
-  input : appdatafilename+'.in',
-  output: appdatafilename,
-  configuration: desktop_conf,
+appdatafile = custom_target(appdatafilename,
+  input : [ appdatafilename+'.in', ],
+  output: [ appdatafilename, ],
+
+  command: [
+    intltool_merge,
+    '--desktop-style',
+    '--utf8',
+    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
+    po_dir,
+    '@INPUT@',
+    '@OUTPUT@',
+  ],
   install: true,
   install_dir: join_paths(get_option('datadir'), 'appdata'),
 )
 
 appdatafilename = 'gimp-data-extras.metainfo.xml'
-appdatafile = configure_file(
-  input : appdatafilename+'.in',
-  output: appdatafilename,
-  configuration: desktop_conf,
+appdatafile = custom_target(appdatafilename,
+  input : [ appdatafilename+'.in', ],
+  output: [ appdatafilename, ],
+
+  command: [
+    intltool_merge,
+    '--desktop-style',
+    '--utf8',
+    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
+    po_dir,
+    '@INPUT@',
+    '@OUTPUT@',
+  ],
   install: true,
   install_dir: join_paths(get_option('datadir'), 'appdata'),
 )
 
-
 custom_target('validate-desktop',
   input : [ desktopfile, ],
   output: [ 'validate-desktop' ],
diff --git a/docs/meson.build b/docs/meson.build
index bbe9652..134184e 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -5,9 +5,10 @@ manconf.set('GIMP_VERSION',   gimp_version)
 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('manpage_gimpdir', '\fB$XDG_CONFIG_HOME\fP/' + join_paths(gimpdir, user_version))
 manconf.set('gimpsysconfdir', gimpsysconfdir)
 
+
 man_files = [
   configure_file(
     input : 'gimptool.1.in',
diff --git a/meson.build b/meson.build
index da07739..da1e038 100644
--- a/meson.build
+++ b/meson.build
@@ -868,7 +868,7 @@ pkgconfig.generate(filebase: 'gimp-' + api_version,
     gimp_api_name,
   ],
   variables: [
-    'datarootdir='    +'${prefix}/'+ get_option('datadir')
+    'datarootdir='    +'${prefix}/'+ get_option('datadir'),
     'gimpdatadir='    +'${prefix}/'+ gimpdatadir,
     'gimplibdir='     +'${prefix}/'+ gimpplugindir,
     'gimpsysconfdir=' + gimpsysconfdir,
diff --git a/po-tags/meson.build b/po-tags/meson.build
index 1a7621e..9d943cb 100644
--- a/po-tags/meson.build
+++ b/po-tags/meson.build
@@ -1,4 +1 @@
-potags_dir = join_paths(
-  meson.source_root(),
-  meson.current_source_dir()
-)
+potags_dir = meson.current_source_dir()
diff --git a/po-tips/meson.build b/po-tips/meson.build
index a8b45a8..57e814a 100644
--- a/po-tips/meson.build
+++ b/po-tips/meson.build
@@ -1 +1,2 @@
+potips_dir = meson.current_source_dir()
 i18n.gettext(gettext_package + '-tips')