Meson build: Don't copy files with configure_file()

kjellahl · kjellahl · commit 0fa45fa19c44 · 2023-01-04T16:26:59.000+01:00
It's deprecated since Meson 0.64. The replacement, fs.copyfile(),
is not useful here. It only copies from the source directory to
the build directory.
diff --git a/MSVC_NMake/libxml++/meson.build b/MSVC_NMake/libxml++/meson.build
@@ -1,6 +1,6 @@
 # MSVC_NMake/libxml++
 
-# Input: pkg_conf_data, xmlxxconfig_h
+# Input: pkg_conf_data, xmlxxconfig_h_meson
 # Output: xmlxx_rc
 
 xmlxx_rc = configure_file(
@@ -9,9 +9,9 @@ xmlxx_rc = configure_file(
   configuration: pkg_conf_data,
 )
 
-# Copy the generated configuration header into the MSVC project directory.
+# Make a copy of the generated configuration header in the MSVC project directory.
 configure_file(
-  input: xmlxxconfig_h,
+  input: xmlxxconfig_h_meson,
   output: 'libxml++config.h',
-  copy: true,
+  configuration: pkg_conf_data,
 )
diff --git a/meson.build b/meson.build
@@ -350,9 +350,10 @@ configure_file(
   install_dir: install_pkgconfigdir,
 )
 
+xmlxxconfig_h_meson = files('libxml++config.h.meson')
 install_includeconfigdir = install_libdir / xmlxx_pcname / 'include'
-xmlxxconfig_h = configure_file(
-  input: 'libxml++config.h.meson',
+configure_file(
+  input: xmlxxconfig_h_meson,
   output: 'libxml++config.h',
   configuration: pkg_conf_data,
   install_dir: install_includeconfigdir,
