[libvirt PATCH] meson: Use @BASENAME@ more

[Daniel Henrique Barboza]

On 8/25/20 1:38 PM, Andrea Bolognani wrote:
> This patch takes care of just the obvious cases: there are
> many more situations where the data we pass to configure_file()
> could likely be obtained in a more effective way, but we can
> address the low-hanging fruits as a first approximation.
> 
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413 at gmail.com>


>   include/libvirt/meson.build |  2 +-
>   meson.build                 |  4 ++--
>   po/meson.build              |  2 +-
>   src/network/meson.build     |  4 ++--
>   tools/meson.build           | 10 +++++-----
>   5 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/include/libvirt/meson.build b/include/libvirt/meson.build
> index 4b77a222f0..601b729c22 100644
> --- a/include/libvirt/meson.build
> +++ b/include/libvirt/meson.build
> @@ -25,7 +25,7 @@ include_conf.merge_from(conf)
>   
>   libvirt_common_h = configure_file(
>     input: libvirt_common_h_in,
> -  output: 'libvirt-common.h',
> +  output: '@BASENAME@',
>     configuration: include_conf,
>   )
>   
> diff --git a/meson.build b/meson.build
> index 35e3da6e55..d146fb3d11 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -106,7 +106,7 @@ configmake_conf.set_quoted('SYSCONFDIR', sysconfdir)
>   
>   configure_file(
>     input: 'configmake.h.in',
> -  output: 'configmake.h',
> +  output: '@BASENAME@',
>     configuration: configmake_conf,
>   )
>   
> @@ -2335,7 +2335,7 @@ run_conf = configuration_data()
>   run_conf.set('abs_builddir', meson.build_root())
>   configure_file(
>     input: 'run.in',
> -  output: 'run',
> +  output: '@BASENAME@',
>     configuration: run_conf,
>   )
>   run_command('chmod', 'a+x', meson.current_build_dir() / 'run')
> diff --git a/po/meson.build b/po/meson.build
> index f9677408ec..69d8be726a 100644
> --- a/po/meson.build
> +++ b/po/meson.build
> @@ -6,7 +6,7 @@ potfiles_conf.set('BUILDDIR', '')
>   
>   potfiles = configure_file(
>     input: 'POTFILES.in',
> -  output: 'POTFILES',
> +  output: '@BASENAME@',
>     configuration: potfiles_conf,
>   )
>   
> diff --git a/src/network/meson.build b/src/network/meson.build
> index 2e031e811f..ae2848697a 100644
> --- a/src/network/meson.build
> +++ b/src/network/meson.build
> @@ -93,7 +93,7 @@ if conf.has('WITH_NETWORK')
>   
>       configure_file(
>         input: 'default.xml.in',
> -      output: 'default.xml',
> +      output: '@BASENAME@',
>         command: [
>           'sed', '-e', 's|</name>|</name>\\n  <uuid>@0@</uuid>|'.format(uuid),
>           '@INPUT@',
> @@ -105,7 +105,7 @@ if conf.has('WITH_NETWORK')
>     else
>       configure_file(
>         input: 'default.xml.in',
> -      output: 'default.xml',
> +      output: '@BASENAME@',
>         copy: true,
>         install: true,
>         install_dir: confdir / 'qemu' / 'networks',
> diff --git a/tools/meson.build b/tools/meson.build
> index e18adfa7f2..b8c6802f0a 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -235,7 +235,7 @@ tools_conf.set('sysconfdir', sysconfdir)
>   
>   configure_file(
>     input: 'virt-xml-validate.in',
> -  output: 'virt-xml-validate',
> +  output: '@BASENAME@',
>     configuration: tools_conf,
>     install: true,
>     install_dir: bindir,
> @@ -244,7 +244,7 @@ configure_file(
>   
>   configure_file(
>     input: 'virt-pki-validate.in',
> -  output: 'virt-pki-validate',
> +  output: '@BASENAME@',
>     configuration: tools_conf,
>     install: true,
>     install_dir: bindir,
> @@ -254,7 +254,7 @@ configure_file(
>   if conf.has('WITH_SANLOCK')
>     configure_file(
>       input: 'virt-sanlock-cleanup.in',
> -    output: 'virt-sanlock-cleanup',
> +    output: '@BASENAME@',
>       configuration: tools_conf,
>       install: true,
>       install_dir: sbindir,
> @@ -264,7 +264,7 @@ endif
>   
>   configure_file(
>     input: 'libvirt-guests.sh.in',
> -  output: 'libvirt-guests.sh',
> +  output: '@BASENAME@',
>     configuration: tools_conf,
>     install: true,
>     install_dir: libexecdir,
> @@ -280,7 +280,7 @@ if init_script == 'systemd'
>   
>     configure_file(
>       input: 'libvirt-guests.service.in',
> -    output: 'libvirt-guests.service',
> +    output: '@BASENAME@',
>       configuration: tools_conf,
>       install: true,
>       install_dir: prefix / 'lib' / 'systemd' / 'system',
>