diff --git a/meson.build b/meson.build index b59f4c0dea..016e5ebd7c 100644 --- a/meson.build +++ b/meson.build @@ -833,7 +833,7 @@ if build_xorg sdkconfig.set('datarootdir', join_paths('${prefix}', get_option('datadir'))) sdkconfig.set('moduledir', join_paths(join_paths('${exec_prefix}', module_dir), module_abi_tag)) sdkconfig.set('sdkdir', join_paths('${prefix}', get_option('includedir'), 'xorg')) - sdkconfig.set('sysconfigdir', join_paths('${datarootdir}', 'X11/xorg.conf.d')) + sdkconfig.set('xserverconfigdir', join_paths('${datarootdir}', 'X11/xorg.conf.d')) sdkconfig.set('abi_ansic', run_command(awk, '-F', '[(,)]', diff --git a/xlibre-server.pc.in b/xlibre-server.pc.in index d564e18d72..99da847280 100644 --- a/xlibre-server.pc.in +++ b/xlibre-server.pc.in @@ -5,7 +5,8 @@ includedir=@includedir@ datarootdir=@datarootdir@ moduledir=@moduledir@ sdkdir=@sdkdir@ -sysconfigdir=@sysconfigdir@ +sysconfigdir=@xserverconfigdir@ +xserverconfigdir=@xserverconfigdir@ abi_ansic=@abi_ansic@ abi_videodrv=@abi_videodrv@ diff --git a/xorg-server.pc.in b/xorg-server.pc.in index 6fc6d1a951..0c179528f8 100644 --- a/xorg-server.pc.in +++ b/xorg-server.pc.in @@ -5,7 +5,8 @@ includedir=@includedir@ datarootdir=@datarootdir@ moduledir=@moduledir@ sdkdir=@sdkdir@ -sysconfigdir=@sysconfigdir@ +sysconfigdir=@xserverconfigdir@ +xserverconfigdir=@xserverconfigdir@ abi_ansic=@abi_ansic@ abi_videodrv=@abi_videodrv@