meson build: implement new copy option with configure_file

diff --git a/docs/graphics/meson.build b/docs/graphics/meson.build
index fad8d10d2938bc8c8f465a3e101477c945c5a1cb..607a0c60d0a8cb3a09b32b23e32a121a22f1bee5 100644 (file)
--- 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 11d517e065ceb92e688aba2bbba012ea0e52e897..b63e767cad41a4fb3d0d7a610dc548e10b853531 100644 (file)
--- 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 142a203d5471ac525945dc7ab91731860d3583b5..fe8511de85b5e83ac6f176be072b8291a7a31d3a 100644 (file)
--- 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',