[gedit/zbrown/deteplification-src: 336/633] build: minor code change




commit 28f37cbee743f546a1819d72da2110c18277fb92
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri May 8 19:48:13 2020 +0200

    build: minor code change
    
    When reading:
    
    'gedit-@0@'.format(api_version)
    
    it's clearer IMHO.

 gedit/meson.build | 6 +++---
 meson.build       | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index 2dddc9e9b..e5cb3fe9b 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -180,7 +180,7 @@ libgedit_sources = [
 ]
 
 libgedit_shared_lib = shared_library(
-  package_string,
+  'gedit-@0@'.format(api_version),
   libgedit_sources + [libgedit_public_enum_types[1], libgedit_private_enum_types[1], libgedit_gresources[1]],
   include_directories: root_include_dir,
   dependencies: libgedit_deps,
@@ -207,7 +207,7 @@ libgedit_gir = gnome.generate_gir(
   namespace: 'Gedit',
   symbol_prefix: 'gedit',
   identifier_prefix: 'Gedit',
-  export_packages: [package_string],
+  export_packages: 'gedit-@0@'.format(api_version),
   includes: libgedit_gir_includes,
   link_with: libgedit_shared_lib,
   install: true,
@@ -252,7 +252,7 @@ libgedit_pc = pkg.generate(
   description: 'GNOME text editor',
   requires: ['gtksourceview-4', 'libpeas-1.0', 'libpeas-gtk-1.0'],
   version: meson.project_version(),
-  subdirs: package_string,
+  subdirs: 'gedit-@0@'.format(api_version),
   libraries: libgedit_shared_lib,
   install_dir: pkgconfigdir,
 )
diff --git a/meson.build b/meson.build
index 60f636ba8..4c88838bd 100644
--- a/meson.build
+++ b/meson.build
@@ -15,8 +15,6 @@ python = import('python')
 
 api_version = '3.38'
 
-package_string = '@0@-@1@'.format(meson.project_name(), api_version)
-
 # Paths
 root_include_dir = include_directories('.')
 


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