[gtksourceview] meson: allow use of meson 0.49



commit 931022f9c418a94f7dff2425bc6009b1260166e0
Author: Christian Hergert <chergert redhat com>
Date:   Sun Apr 21 09:31:51 2019 -0700

    meson: allow use of meson 0.49
    
    We don't need 'install: true' for configuration_file() if install_dir
    has been set.

 data/glade/meson.build    | 11 +++--------
 gtksourceview/meson.build |  1 -
 meson.build               |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/data/glade/meson.build b/data/glade/meson.build
index 0b469c2a..e626fd0f 100644
--- a/data/glade/meson.build
+++ b/data/glade/meson.build
@@ -10,15 +10,10 @@ catalog_in = configuration_data()
 catalog_in.set('GSV_API_VERSION', api_version)
 
 catalog_xml = configure_file(
-  input: 'gtksourceview.xml.in',
-  output: 'gtksourceview.xml',
+          input: 'gtksourceview.xml.in',
+         output: 'gtksourceview.xml',
   configuration: catalog_in,
-  install: true,
-  install_dir: join_paths(
-    datadir,
-    'glade',
-    'catalogs'
-  )
+    install_dir: join_paths(datadir, 'glade', 'catalogs')
 )
 
 if xmllint_prg.found()
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index b87fba92..5d0d6ce1 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -147,7 +147,6 @@ gtksourceversion_h = configure_file(
           input: 'gtksourceversion.h.in',
          output: 'gtksourceversion.h',
   configuration: version_h,
-        install: true,
     install_dir: join_paths(pkgincludedir, 'gtksourceview'),
 )
 
diff --git a/meson.build b/meson.build
index 11c2cdf6..6c4a8a38 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('gtksourceview', 'c',
           version: '4.3.0',
           license: 'LGPL-2.1-or-later',
-    meson_version: '>= 0.50.0',
+    meson_version: '>= 0.49.0',
   default_options: [ 'c_std=gnu99',
                      'buildtype=debugoptimized',
                      'warning_level=2' ],


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