[gimp/meson: 621/805] current_source_dir() already contains source_root().

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

commit 7d774f5e9f16b03cb6719fcdbba34dcd1e2c3f06
Author: Félix Piédallu <felix piedallu me>
Date:   Thu Jan 11 13:39:52 2018 +0100

    current_source_dir() already contains source_root().

 data/tags/meson.build                |    2 +-
 data/tips/meson.build                |    4 ++--
 menus/meson.build                    |    2 +-
 pdb/meson.build                      |    4 ++--
 plug-ins/gfig/images/meson.build     |    6 +-----
 plug-ins/lighting/images/meson.build |    6 +-----
 po/meson.build                       |    5 +----
 7 files changed, 9 insertions(+), 20 deletions(-)
---
diff --git a/data/tags/meson.build b/data/tags/meson.build
index 4d6c627..e634180 100644
--- a/data/tags/meson.build
+++ b/data/tags/meson.build
@@ -25,7 +25,7 @@ custom_target('validate-tags',
   command: [
     xmllint,
     '--noout',
-    '--path', join_paths(meson.source_root(), meson.current_source_dir()),
+    '--path', meson.current_source_dir(),
     '--valid', '@INPUT@',
   ],
   build_always: true,
diff --git a/data/tips/meson.build b/data/tips/meson.build
index 1bf6b07..6c27377 100644
--- a/data/tips/meson.build
+++ b/data/tips/meson.build
@@ -25,7 +25,7 @@ custom_target('validate-tips',
   command: [
     xmllint,
     '--noout',
-    '--path', join_paths(meson.source_root(), meson.current_source_dir()),
+    '--path', meson.current_source_dir(),
     '--valid', '@INPUT@',
   ],
   build_always: true,
@@ -38,7 +38,7 @@ custom_target('fortunes-tips',
   command: [
     xsltproc,
     '--stringparam', 'lang', 'en',
-    '--path', join_paths(meson.source_root(), meson.current_source_dir()),
+    '--path', meson.current_source_dir(),
     '--output', '@OUTPUT@',
     '@INPUT1@',
     '@INPUT0@',
diff --git a/menus/meson.build b/menus/meson.build
index ef26223..8d60050 100644
--- a/menus/meson.build
+++ b/menus/meson.build
@@ -64,7 +64,7 @@ custom_target('validate_menus',
   command: [
     xmllint,
     '--noout',
-    '--path', join_paths(meson.source_root(), meson.current_source_dir()),
+    '--path', meson.current_source_dir(),
     '@INPUT@',
   ],
 )
diff --git a/pdb/meson.build b/pdb/meson.build
index 5ab9d3b..82f79b5 100644
--- a/pdb/meson.build
+++ b/pdb/meson.build
@@ -77,8 +77,8 @@ enum_headers = [
 ]
 
 # Perl environment
-perlsrcdir = join_paths(meson.source_root(), meson.current_source_dir())
-perlbindir = join_paths(meson.build_root(),  meson.current_source_dir())
+perlsrcdir = meson.current_source_dir()
+perlbindir = meson.current_build_dir()
 
 perl_env = [
   'PDBGEN_BACKUP=' + (pdbgen_backup ? '1' : '0'),
diff --git a/plug-ins/gfig/images/meson.build b/plug-ins/gfig/images/meson.build
index 657aec9..1a7b192 100644
--- a/plug-ins/gfig/images/meson.build
+++ b/plug-ins/gfig/images/meson.build
@@ -20,11 +20,7 @@ stock_icons = [
 stock_icons_list = []
 foreach name : stock_icons
   stock_icons_list += name.underscorify()
-  stock_icons_list += join_paths(
-    meson.source_root(),
-    meson.current_source_dir(),
-    name + '.png'
-  )
+  stock_icons_list += join_paths(meson.current_source_dir(), name + '.png')
 endforeach
 
 stock_pixbufs_h = custom_target('gfig-stock-pixbufs.h',
diff --git a/plug-ins/lighting/images/meson.build b/plug-ins/lighting/images/meson.build
index 27caf38..1521077 100644
--- a/plug-ins/lighting/images/meson.build
+++ b/plug-ins/lighting/images/meson.build
@@ -14,11 +14,7 @@ stock_icons = [
 stock_icons_list = []
 foreach name : stock_icons
   stock_icons_list += name.underscorify()
-  stock_icons_list += join_paths(
-    meson.source_root(),
-    meson.current_source_dir(),
-    name + '.png'
-  )
+  stock_icons_list += join_paths(meson.current_source_dir(), name + '.png')
 endforeach
 
 stock_pixbufs_h = custom_target('stock-pixbufs.h',
diff --git a/po/meson.build b/po/meson.build
index 0832e52..5252486 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,5 +1,2 @@
-po_dir = join_paths(
-  meson.source_root(),
-  meson.current_source_dir(),
-)
+po_dir = meson.current_source_dir()
 i18n.gettext(gettext_package)