[gimp/meson: 118/127] Fix the fix (mypaint-brushes not available on Mingw)

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

commit 53e7a81efa957300d64625ec5526b613dbfb115f
Author: Félix Piédallu <felix piedallu me>
Date:   Tue Jan 30 15:13:07 2018 +0100

    Fix the fix (mypaint-brushes not available on Mingw)

 app/config/meson.build |    6 +-----
 meson.build            |   12 +++++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/app/config/meson.build b/app/config/meson.build
index 516fa8c..89b9e3b 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -26,10 +26,6 @@ libappconfig_sources = [
   appconfigenums,
 ]
 
-mypaint_args = libmypaint_brushes.found() ? [] : [
-  '-DMYPAINT_BRUSHES_DIR="@0@"'.format(mypaint_brushes_dir),
-]
-
 libappconfig = static_library('appconfig',
   libappconfig_sources,
   include_directories: [ rootInclude, rootAppInclude, ],
@@ -40,7 +36,7 @@ libappconfig = static_library('appconfig',
     mypaint_args,
   ],
   dependencies: [
-    cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2, libmypaint,
+    cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2, libmypaint, mypaint_brushes,
   ],
 )
 
diff --git a/meson.build b/meson.build
index 7bc7fb2..3a8df13 100644
--- a/meson.build
+++ b/meson.build
@@ -161,9 +161,15 @@ pangoft2          = dependency('pangoft2',           version: '>=1.29.4')
 rsvg              = dependency('librsvg-2.0',        version: '>=2.40.6')
 
 # xgettext           = dependency('xgettext',           version: '>=0.19')
-if not libmypaint_brushes.found()
-  mypaint_brushes_dir = '/usr/share/mypaint-data/1.0/brushes'
-endif
+
+# Mypaint-brushes not available on MingW
+mypaint_brushes = libmypaint_brushes.found() ? [
+  libmypaint_brushes,
+] : []
+mypaint_args    = libmypaint_brushes.found() ? [] : [
+  '-DMYPAINT_BRUSHES_DIR="/usr/share/mypaint-data/1.0/brushes"',
+]
+
 
 ################################################################################
 # Check for GLib Networking