[dia: 23/105] #19: Replace 'dia' with meson.project_name().



commit fdf78a2e01d3a88243d115537aa788af2fbdbf53
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Fri Dec 21 01:31:20 2018 +0000

    #19: Replace 'dia' with meson.project_name().
    
      - Also move i18n definition to po/meson.build.

 meson.build    | 11 ++++-------
 po/meson.build |  4 +++-
 2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index c26ea222..812ffdb1 100644
--- a/meson.build
+++ b/meson.build
@@ -6,10 +6,6 @@ project('dia',
         default_options : []
 )
 
-i18n = import('i18n')
-
-gettext_package = 'dia'
-
 cc = meson.get_compiler('c')
 
 #GTK_MODULES="gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.20.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0 gmodule-2.0"
@@ -37,16 +33,17 @@ gdk_pixbuf_csource = find_program('gdk-pixbuf-csource')
 
 datadir = join_paths(get_option('prefix'),
                      get_option('datadir'))
-pkgdatadir = join_paths(datadir, 'dia')
+
+pkgdatadir = join_paths(datadir, meson.project_name())
 
 dialibdir = join_paths(get_option('prefix'),
                        get_option('libdir'),
-                       'dia')
+                       meson.project_name())
 
 # Specify a header configuration file
 conf = configuration_data()
 conf.set_quoted('VERSION', meson.project_version())
-conf.set_quoted('GETTEXT_PACKAGE', 'dia')
+conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('DATADIR', datadir)
 conf.set_quoted('PKGDATADIR', pkgdatadir)
 conf.set_quoted('DIALIBDIR',  dialibdir)
diff --git a/po/meson.build b/po/meson.build
index 57d1266b..dd441539 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1,3 @@
-i18n.gettext(gettext_package, preset: 'glib')
+i18n = import('i18n')
+
+i18n.gettext(meson.project_name())


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