On Sat, Jun 30, 2018 at 12:53:35PM +0100, Jon Turney wrote:
> paths returned by get_option('foodir') are potentially relative to prefix
>
> Noticed when comparing manpages generated by a meson build with those
> generated by an autotools build
>
> Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
pushed, thanks
To git+ssh://git.freedesktop.org/git/xorg/xserver
38ff29ec8..49283e238 master -> master
Cheers,
Peter
> ---
> meson.build | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index f2c71fe27..706228228 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -520,9 +520,9 @@ manpage_config.set('libmansuffix', '3')
> manpage_config.set('miscmansuffix', '7')
> manpage_config.set('filemansuffix', '5')
> manpage_config.set('logdir', log_dir)
> -manpage_config.set('datadir', get_option('datadir'))
> -manpage_config.set('mandir', get_option('mandir'))
> -manpage_config.set('sysconfdir', get_option('sysconfdir'))
> +manpage_config.set('datadir', join_paths(get_option('prefix'),
> get_option('datadir')))
> +manpage_config.set('mandir', join_paths(get_option('prefix'),
> get_option('mandir')))
> +manpage_config.set('sysconfdir', join_paths(get_option('prefix'),
> get_option('sysconfdir')))
> manpage_config.set('xconfigdir', 'xorg.conf.d')
> manpage_config.set('xkbdir', xkb_dir)
> manpage_config.set('XKB_DFLT_RULES', get_option('xkb_default_rules'))
> --
> 2.17.0
>
> _______________________________________________
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
