[gnome-klotski] Unify Meson variable naming.

[Arnaud B. <arnaudb src gnome org>]

commit b734836baca76a939dfc0432d3a1adb598dcebf6
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat Oct 26 03:55:07 2019 +0200

    Unify Meson variable naming.
    
    Should make CI happy.

 data/meson.build | 6 +++---
 meson.build      | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 780df88..af16b6a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -3,19 +3,19 @@ icon_sizes = ['16', '22', '24', '32', '48']
 foreach size : icon_sizes
   install_data(
     join_paths('icons', 'hicolor', '@0@x@0@'.format(size), '@0@.png'.format(project_id)),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '@0@x@0@'.format(size), 'apps')
+    install_dir: join_paths(icondir, '@0@x@0@'.format(size), 'apps')
   )
 endforeach
 # Install scalable icon
 install_data(
   join_paths('icons', 'hicolor', 'scalable', '@0@.svg'.format(project_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps')
+  install_dir: join_paths(icondir, 'scalable', 'apps')
 )
 
 # Install symbolic icon
 install_data(
   join_paths('icons', 'hicolor', 'scalable', '@0 -symbolic svg'.format(project_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps')
+  install_dir: join_paths(icondir, 'symbolic', 'apps')
 )
 
 # Install gschema
diff --git a/meson.build b/meson.build
index 22084a3..dd61712 100644
--- a/meson.build
+++ b/meson.build
@@ -25,13 +25,15 @@ glib_compile_schema     = find_program('glib-compile-schemas',  required: true)
 add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language: 'c')
 
 localedir   = join_paths(get_option('prefix'), get_option('localedir'))
-datadir     = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+datadir     = join_paths(get_option('prefix'), get_option('datadir'))
 bindir      = join_paths(get_option('prefix'), get_option('bindir'))
+icondir     = join_paths(datadir, 'icons', 'hicolor')
+pkgdatadir  = join_paths(datadir, meson.project_name())
 
 conf = configuration_data ()
 conf.set_quoted ('VERSION', meson.project_version())
 conf.set_quoted ('GETTEXT_PACKAGE', meson.project_name())
-conf.set_quoted ('DATA_DIRECTORY', datadir)
+conf.set_quoted ('DATA_DIRECTORY', pkgdatadir)
 conf.set_quoted ('LOCALEDIR', localedir)
 
 configure_file(output: 'config.h', configuration: conf)