xorg-server: fix serverconfigdir location

prevents lib/xorg/protocol.txt from happening
This commit is contained in:
maxice8 2018-08-20 12:44:06 -03:00
parent de2e45c40f
commit 11a4444bf8
No known key found for this signature in database
GPG key ID: 543B9D4F4299F06B
2 changed files with 12 additions and 1 deletions

View file

@ -0,0 +1,11 @@
--- meson.build
+++ meson.build
@@ -507,7 +507,7 @@ glx_inc = include_directories('glx')
top_srcdir_inc = include_directories('.')
-serverconfigdir = join_paths(get_option('libdir'), 'xorg')
+serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg')
manpage_config = configuration_data()
manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))

View file

@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.1
revision=6
revision=7
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb