[gnome-online-accounts] build: Remove duplicated goa_long_name



commit 2d757d971e5a668f30b840db5ac26bb8197de403
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Jul 19 09:22:30 2018 +0200

    build: Remove duplicated goa_long_name
    
    Following autotools build files, the project name was set to
    `GNOME Online Accounts`, so a variable was created to be used as
    package datadir and gettext domain set to `gnome-online-accounts`
    string.
    
    However, recently the project name has been changed to
    `gnome-online-accounts` so the variable used as package datadir and
    gettext domain is not necessary anymore.
    
    https://gitlab.gnome.org/GNOME/gnome-online-accounts/merge_requests/2

 meson.build    | 5 ++---
 po/meson.build | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index a943b0eb..671d2967 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,6 @@ project(
   meson_version: '>= 0.47.2'
 )
 
-goa_long_name = 'gnome-online-accounts'
 goa_name = 'goa'
 
 goa_version = meson.project_version()
@@ -31,7 +30,7 @@ goa_libexecdir = join_paths(goa_prefix, get_option('libexecdir'))
 goa_localedir = join_paths(goa_prefix, get_option('localedir'))
 goa_mandir = join_paths(goa_prefix, get_option('mandir'))
 
-goa_pkgdatadir = join_paths(goa_datadir, goa_long_name)
+goa_pkgdatadir = join_paths(goa_datadir, meson.project_name())
 goa_pkgincludedir = join_paths(goa_includedir, goa_api_name)
 goa_pkglibdir = join_paths(goa_libdir, goa_api_name)
 
@@ -55,7 +54,7 @@ config_h = configuration_data()
 # quoted defines
 config_h.set_quoted('PACKAGE_VERSION', goa_version)
 # i18n
-config_h.set_quoted('GETTEXT_PACKAGE', goa_long_name)
+config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 
 # version values
 config_h.set('GOA_MAJOR_VERSION', goa_major_version)
diff --git a/po/meson.build b/po/meson.build
index 91cc7cf8..e9b77d79 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1 @@
-i18n.gettext(goa_long_name, preset: 'glib')
+i18n.gettext(meson.project_name(), preset: 'glib')


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