On Tue, Aug 25, 2020 at 09:58:23PM +0400, marcandre.lur...@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> The following patches will make use of it to fix installation paths.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> configure | 1 +
> meson_options.txt | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/configure b/configure
> index b1e11397a8..e19e2de2f0 100755
> --- a/configure
> +++ b/configure
> @@ -8222,6 +8222,7 @@ NINJA=$PWD/ninjatool $meson setup \
> --mandir "${pre_prefix}$mandir" \
> --sysconfdir "${pre_prefix}$sysconfdir" \
> --localstatedir "${pre_prefix}$local_statedir" \
> + -Dconfsuffix="$confsuffix" \
> -Doptimization=$(if test "$debug" = yes; then echo 0; else echo 2;
> fi) \
> -Ddebug=$(if test "$debug_info" = yes; then echo true; else echo
> false; fi) \
> -Dwerror=$(if test "$werror" = yes; then echo true; else echo false;
> fi) \
> diff --git a/meson_options.txt b/meson_options.txt
> index c55f9cd94c..7bb2c0fca9 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -1,3 +1,4 @@
> +option('confsuffix', type : 'string', value: 'qemu')
In "configure", $confsuffix defaults to "/qemu", but here is misses the
"/". Not having the "/" is better as meson will add the correct platform
specific dir separator, but it makes me think that configure needs updating
to strip a leading "/" when passing it into meson ?
> option('gettext', type : 'boolean', value : true)
> option('sdl', type : 'feature', value : 'auto')
> option('sdl_image', type : 'feature', value : 'auto')
> --
> 2.26.2
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
