Hi
On Wed, Aug 26, 2020 at 12:32 PM Daniel P. Berrangé <berra...@redhat.com>
wrote:
> On Tue, Aug 25, 2020 at 09:58:25PM +0400, marcandre.lur...@redhat.com
> wrote:
> > From: Marc-André Lureau <marcandre.lur...@redhat.com>
> >
> > When cross-compiling, by default qemu_docdir is 'c:\Program Files\QEMU\'
> > which is not recognized as being an absolute path, and meson will end up
> > adding the prefix again.
> >
> > Add an option to pass docdir location to meson, pre-prefixed like we do
> > with other directories and use that instead of
> config_host['qemu_docdir'].
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> > ---
> > configure | 1 +
> > docs/meson.build | 4 ++--
> > meson.build | 3 ++-
> > meson_options.txt | 1 +
> > 4 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/configure b/configure
> > index e19e2de2f0..e644841299 100755
> > --- a/configure
> > +++ b/configure
> > @@ -8223,6 +8223,7 @@ NINJA=$PWD/ninjatool $meson setup \
> > --sysconfdir "${pre_prefix}$sysconfdir" \
> > --localstatedir "${pre_prefix}$local_statedir" \
> > -Dconfsuffix="$confsuffix" \
> > + -Ddocdir="${pre_prefix}$qemu_docdir" \
>
> This is passing an absolute path.....
>
>
> > diff --git a/meson_options.txt b/meson_options.txt
> > index 7bb2c0fca9..fb9312fddd 100644
> > --- a/meson_options.txt
> > +++ b/meson_options.txt
> > @@ -1,4 +1,5 @@
> > option('confsuffix', type : 'string', value: 'qemu')
> > +option('docdir', type : 'string', value : 'doc/qemu')
>
> ...but this default is a relative dir, presumably relative to
> datadir. The code expects an absolute dir.
>
Meson accepts both absolute and relative path for installation location. If
it's relative, it will be under the $prefix directory.
>
> 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 :|
>
>
>
--
Marc-André Lureau
