From 588f81cf847c6442bd7603bcad32d9deb6a876de Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 19 Dec 2025 17:01:50 +0100 Subject: [PATCH] xorg-server.pc: add xserverconfigdir variable That variable is supposed to be used by drivers to query the path to the xserver config directory (eg /etc/X11/xorg.conf.d), if they have to install config snippets. It's supposed to replace / phase-out the sysconfigdir variable, which has a bit misleading name. Signed-off-by: Enrico Weigelt, metux IT consult --- meson.build | 2 +- xlibre-server.pc.in | 3 ++- xorg-server.pc.in | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index d9e92f3a02..6feb1cbe6c 100644 --- a/meson.build +++ b/meson.build @@ -797,7 +797,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@