Module: Mesa Branch: master Commit: fb62e642ae667c99aeb3015fa77ab668af5e4ee6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb62e642ae667c99aeb3015fa77ab668af5e4ee6
Author: Dylan Baker <dylan.c.ba...@intel.com> Date: Wed May 20 18:00:14 2020 -0700 vulkan-overlay/meson: use install_data instead of configure_file We don't want to copy the file into the build directory, we want to install it. That's what install_data is for. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2924 Fixes: 56ccea58ae7f6fd56cf4a1697d2cceb68866b552 ("vulkan/overlay: Add basic overlay control script.") Acked-by: Matt Turner <matts...@gmail.com> Reviewed-by: Eric Engestrom <e...@engestrom.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4740> --- src/vulkan/overlay-layer/meson.build | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build index 37fd7a3412a..19856f66d25 100644 --- a/src/vulkan/overlay-layer/meson.build +++ b/src/vulkan/overlay-layer/meson.build @@ -53,9 +53,8 @@ install_data( install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'), ) -configure_file( - input : files('mesa-overlay-control.py'), - output : '@PLAINNAME@', - configuration : configuration_data(), # only copy the file - install_dir: get_option('bindir'), +install_data( + 'mesa-overlay-control.py', + install_dir : get_option('bindir'), + install_mode : 'r-xr-xr-x', ) _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit