From: John Marshall <jtm.home@gmail.com>
Date: Fri, 29 Mar 2019 09:08:07 +0000 (+0000)
Subject: meson build: implement new copy option with configure_file
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~11^2~122
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9ea6e8024adb7af53841c01bf0876b19f8a6bcad;p=babl.git

meson build: implement new copy option with configure_file
---

diff --git a/docs/graphics/meson.build b/docs/graphics/meson.build
index fad8d10..607a0c6 100644
--- a/docs/graphics/meson.build
+++ b/docs/graphics/meson.build
@@ -7,20 +7,19 @@ graphic_files = [
 
 graphic_files_install = []
 
-# Dummy config to copy index.html to build
+# Copy index.html to build
 graphic_files_install += configure_file(
   input:  'index.html',
   output: '@PLAINNAME@',
-  configuration: configuration_data()
+  copy: true
 )
 
-
 foreach file : graphic_files
-  # Dummy config to copy svg files to build
+  # Copy svg files to build
   graphic_files_install += configure_file(
     input:  file,
     output: '@PLAINNAME@',
-    configuration: configuration_data()
+    copy: true
   )
 endforeach
 
diff --git a/docs/meson.build b/docs/meson.build
index 11d517e..b63e767 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -13,9 +13,11 @@ index_static_html = configure_file(
   configuration: conf,
 )
 
-babl_css = configure_file(input : 'babl.css',
+babl_css = configure_file(
+  input : 'babl.css',
   output : 'babl.css',
-  configuration : configuration_data())
+  copy: true
+)
 
 index_html_tmp_env = [
   'BABL_PATH='+ join_paths(meson.build_root(), 'extensions'),
diff --git a/meson.build b/meson.build
index 142a203..fe8511d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('babl', 'c',
   license: 'LGPL3+',
   version: '0.1.63',
-  meson_version: '>=0.40.0',
+  meson_version: '>=0.47.0',
   default_options: [
     'libdir=lib',
     'sysconfdir=/etc',