From e8ba84091eadbe1b0edabf9ec276f00651729aa7 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 26 Jul 2019 18:46:15 +0200
Subject: meson: don't pass "install" to configure_file() unless really needed

In our case it was never needed because it defaults to true if install_dir is set,
which it always is for all calls.

This avoids a warning when running with newer meson where it complains that install
is only available with 0.50+.

Fixes #298
---
 girepository/meson.build | 1 -
 giscanner/meson.build    | 2 --
 meson.build              | 2 --
 tools/meson.build        | 1 -
 4 files changed, 6 deletions(-)

diff --git a/girepository/meson.build b/girepository/meson.build
index 1d7aed6b..0183153e 100644
--- a/girepository/meson.build
+++ b/girepository/meson.build
@@ -179,7 +179,6 @@ configure_file(input : 'gdump.c',
   output : 'gdump.c',
   copy: true,
   install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'),
-  install : true,
 )
 
 girepo_dep = declare_dependency(
diff --git a/giscanner/meson.build b/giscanner/meson.build
index 67c043d0..4ff28038 100644
--- a/giscanner/meson.build
+++ b/giscanner/meson.build
@@ -37,12 +37,10 @@ giscanner_conf_data = configuration_data()
 giscanner_conf_data.set('VERSION', meson.project_version())
 giscanner_built_files += configure_file(input: '_version.py.in',
                                         output: '_version.py',
-                                        install : true,
                                         install_dir : giscannerdir,
                                         configuration: giscanner_conf_data)
 foreach f : giscanner_files
   giscanner_built_files += configure_file(input : f, output : f,
-                                          install : true,
                                           install_dir : giscannerdir,
                                           configuration : giscanner_conf_data)
 endforeach
diff --git a/meson.build b/meson.build
index 0a123e14..83dac0fd 100644
--- a/meson.build
+++ b/meson.build
@@ -207,7 +207,6 @@ configure_file(
   input: 'gobject-introspection-no-export-1.0.pc.in',
   output: 'gobject-introspection-no-export-1.0.pc',
   configuration: pkgconfig_conf,
-  install: true,
   install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
 )
 
@@ -215,6 +214,5 @@ configure_file(
   input: 'gobject-introspection-1.0.pc.in',
   output: 'gobject-introspection-1.0.pc',
   configuration: pkgconfig_conf,
-  install: true,
   install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
 )
diff --git a/tools/meson.build b/tools/meson.build
index f9b11616..6cc3186a 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -30,7 +30,6 @@ foreach tool : tools
     input: 'g-ir-tool-template.in',
     output: tool[0],
     configuration: tools_conf,
-    install: true,
     install_dir: get_option('bindir'),
   )
   tool_output += tool_bin
-- 
cgit v1.2.1