[gcab] Fixes to meson build to match the former autotools build



commit c0947f61051866efd256c6e4573c01fb944406b2
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date:   Tue Jan 23 14:24:06 2018 +0100

    Fixes to meson build to match the former autotools build
    
    - conf: Set PACKAGE_STRING (used in gcab --version) correctly.
    - conf: Set LOCALEDIR to the absolute path.
    - manpage: Use PACKAGE_STRING (which is already quoted).
    - introspection: Set package name to 'libgcab-1.0'.
    - introspection: Add missing GLib-2.0 include.
    
    Signed-off-by: Richard Hughes <richard hughsie com>

 libgcab/meson.build |    3 ++-
 meson.build         |    5 ++---
 src/gcab.1.in       |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libgcab/meson.build b/libgcab/meson.build
index 1649a9f..6ff8801 100644
--- a/libgcab/meson.build
+++ b/libgcab/meson.build
@@ -82,11 +82,12 @@ if get_option('introspection')
     symbol_prefix : 'gcab',
     header : 'libgcab.h',
     identifier_prefix : 'GCab',
-    export_packages : 'libgcab',
+    export_packages : 'libgcab-1.0',
     dependencies : [
       gio,
     ],
     includes : [
+      'GLib-2.0',
       'Gio-2.0',
       'GObject-2.0',
     ],
diff --git a/meson.build b/meson.build
index 81f7d0e..0fc29de 100644
--- a/meson.build
+++ b/meson.build
@@ -93,9 +93,8 @@ i18n = import('i18n')
 conf = configuration_data()
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('PACKAGE_NAME', meson.project_name())
-conf.set_quoted('PACKAGE_STRING', meson.project_name())
-conf.set_quoted('VERSION', meson.project_version())
-conf.set_quoted('LOCALEDIR', get_option('localedir'))
+conf.set_quoted('PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), meson.project_version()))
+conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
 conf.set_quoted('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=msitools')
 conf.set_quoted('TESTDATADIR', join_paths(meson.source_root(), 'tests'))
 configure_file(
diff --git a/src/gcab.1.in b/src/gcab.1.in
index 9be70e8..9bcef08 100644
--- a/src/gcab.1.in
+++ b/src/gcab.1.in
@@ -1,4 +1,4 @@
-.TH GCAB "1" "December 2012" "@PACKAGE_NAME@ @VERSION@"
+.TH GCAB "1" "December 2012" @PACKAGE_STRING@
 .SH NAME
 gcab \- Program to create Microsoft cabinet (.cab) archives
 .SH SYNOPSIS


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