[devhelp] build: simplify stuff for the config.h

[Sébastien Wilmet <swilmet src gnome org>]

commit c473648c012211fad532f9926d5d62c688b6c000
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Apr 4 02:33:13 2020 +0200

    build: simplify stuff for the config.h

 devhelp/meson.build |  2 +-
 meson.build         | 18 +++---------------
 src/meson.build     |  2 +-
 3 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/devhelp/meson.build b/devhelp/meson.build
index ce888f7c..7fc50cd9 100644
--- a/devhelp/meson.build
+++ b/devhelp/meson.build
@@ -81,7 +81,7 @@ libdevhelp_static = static_library(
   [libdevhelp_public_c_files,
    libdevhelp_private_c_files,
    libdevhelp_enums],
-  include_directories: [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
+  include_directories: ROOT_INCLUDE_DIR,
   dependencies: LIBDEVHELP_DEPS
 )
 
diff --git a/meson.build b/meson.build
index be342a22..29796f08 100644
--- a/meson.build
+++ b/meson.build
@@ -69,19 +69,9 @@ DEVHELP_APP_DEPS = [
 
 config_data = configuration_data()
 GETTEXT_PACKAGE_NAME = meson.project_name()
-config_data.set_quoted(
-  'GETTEXT_PACKAGE',
-  GETTEXT_PACKAGE_NAME,
-  description: 'gettext package name.'
-)
-config_data.set_quoted(
-  'DATADIR',
-  join_paths(get_option('prefix'), get_option('datadir'))
-)
-config_data.set_quoted(
-  'LOCALEDIR',
-  join_paths(get_option('prefix'), get_option('localedir'))
-)
+config_data.set_quoted('GETTEXT_PACKAGE', GETTEXT_PACKAGE_NAME)
+config_data.set_quoted('DATADIR', get_option('prefix') / get_option('datadir'))
+config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 config_data.set_quoted('PACKAGE_VERSION', meson.project_version())
 config_data.set_quoted('LIBDEVHELP_API_VERSION', LIBDEVHELP_API_VERSION)
 config_data.set('FLATPAK_BUILD', get_option('flatpak_build'))
@@ -91,8 +81,6 @@ configure_file(
   configuration: config_data
 )
 
-CONFIG_H_INCLUDE_DIR = include_directories('.')
-
 # Misc
 
 # For #include <devhelp/something.h>
diff --git a/src/meson.build b/src/meson.build
index fe59674a..341e2d9f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -19,7 +19,7 @@ devhelp_app_sources += GNOME.compile_resources(
 executable(
   'devhelp',
   devhelp_app_sources,
-  include_directories: [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
+  include_directories: ROOT_INCLUDE_DIR,
   dependencies: [DEVHELP_APP_DEPS, SHARED_LIBDEVHELP_DECLARED_DEP],
   install: true
 )