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

kjellahl · kjellahl · commit b863edbe85b8 · 2023-01-04T10:53:56.000+01:00
It's deprecated from 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/meson.build b/MSVC_NMake/meson.build
@@ -1,6 +1,6 @@
 # MSVC_NMake
 
-# Input: pkg_conf_data, sigcxxconfig_h, project_build_root, python3,
+# Input: pkg_conf_data, sigcxxconfig_h_meson, project_build_root, python3,
 #        can_add_dist_script
 # Output: sigc_rc
 
@@ -10,11 +10,11 @@ sigc_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: sigcxxconfig_h,
+  input: sigcxxconfig_h_meson,
   output: 'sigc++config.h',
-  copy: true,
+  configuration: pkg_conf_data,
 )
 
 untracked_msvc_nmake = 'untracked' / 'MSVC_NMake'
diff --git a/meson.build b/meson.build
@@ -241,9 +241,10 @@ configure_file(
   configuration: pkg_conf_data,
 )
 
+sigcxxconfig_h_meson = files('sigc++config.h.meson')
 install_includeconfigdir = install_libdir / sigcxx_pcname / 'include'
-sigcxxconfig_h = configure_file(
-  input: 'sigc++config.h.meson',
+configure_file(
+  input: sigcxxconfig_h_meson,
   output: 'sigc++config.h',
   configuration: pkg_conf_data,
   install_dir: install_includeconfigdir,
