[meld: 3/10] build: Reduce the use of directory variables




commit 101dd87e7b12ee6bde55e227ffa158521f1c1022
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Sun Feb 14 20:44:58 2021 +0100

    build: Reduce the use of directory variables
    
    The use of variables with directory paths have been reduce by
    removing the unused ones and replacing their use by their values in
    those cases that they are used only once.

 data/meson.build | 8 ++++----
 meson.build      | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 2d59b3ed..21e8a334 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -8,7 +8,7 @@ install_data(
 # Install schema file
 install_data(
   '@0  gschema xml'.format(resource_base_id),
-  install_dir: schemadir
+  install_dir: datadir / 'glib-2.0/schemas',
 )
 
 # Install desktop file
@@ -25,7 +25,7 @@ desktop_file = i18n.merge_file(
   po_dir: podir,
   type: 'desktop',
   install: true,
-  install_dir: desktopdir,
+  install_dir: datadir / 'applications',
 )
 
 # Validate Desktop file
@@ -51,7 +51,7 @@ appdata_file = i18n.merge_file(
   output: '@0  appdata xml'.format(application_id),
   po_dir: podir,
   install: true,
-  install_dir: appdatadir,
+  install_dir: datadir / 'metainfo',
 )
 
 # Validate AppData file
@@ -75,7 +75,7 @@ mimetype_file = i18n.merge_file(
   po_dir: podir,
   data_dirs: itsdir,
   install: true,
-  install_dir: mimedatadir,
+  install_dir: datadir / 'mime/packages',
 )
 
 # Check GSettings schema
diff --git a/meson.build b/meson.build
index 387aa133..3dd7790f 100644
--- a/meson.build
+++ b/meson.build
@@ -34,16 +34,11 @@ prefix = get_option('prefix')
 
 bindir = prefix / get_option('bindir')
 datadir = prefix / get_option('datadir')
-libexecdir = prefix / get_option('libexecdir')
 localedir = prefix / get_option('localedir')
 mandir = prefix / get_option('mandir')
 
-appdatadir = datadir / 'metainfo'
-desktopdir = datadir / 'applications'
 icondir = datadir / 'icons'
-mimedatadir = datadir / 'mime/packages'
 pkgdatadir = datadir / meson.project_name()
-schemadir = datadir / 'glib-2.0/schemas'
 
 itsdir = meson.current_source_dir() / 'gettext'
 podir = meson.current_source_dir() / 'po'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]