From 9af86b7b765c584a5155bac00ecb5436b06664f1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer
Date: Thu, 20 May 2021 12:35:27 +1000
Subject: [PATCH] man: specify the xdg and confdata dirs in the pipewire.conf
man page
---
man/meson.build | 1 +
man/pipewire.conf.5.xml.in | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/man/meson.build b/man/meson.build
index 97bcec52b..c15ad34b4 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -4,6 +4,7 @@ manpage_conf.set('PACKAGE_VERSION', meson.project_version())
manpage_conf.set('PACKAGE_URL', 'http://pipewire.org')
manpage_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/pipewire/pipewire/issues')
manpage_conf.set('PIPEWIRE_CONFIG_DIR', pipewire_configdir)
+manpage_conf.set('PIPEWIRE_CONFDATADIR', pipewire_confdatadir)
manpage_conf.set('top_srcdir', meson.source_root())
manpage_conf.set('top_builddir', meson.build_root())
diff --git a/man/pipewire.conf.5.xml.in b/man/pipewire.conf.5.xml.in
index 3295f3822..c2d34e9b3 100644
--- a/man/pipewire.conf.5.xml.in
+++ b/man/pipewire.conf.5.xml.in
@@ -9,7 +9,9 @@ This file is part of PipeWire.
+ $XDG_CONFIG_HOME/pipewire/pipewire.conf
@PIPEWIRE_CONFIG_DIR@/pipewire.conf
+ @PIPEWIRE_CONFDATADIR@/pipewire.conf
@@ -20,8 +22,8 @@ This file is part of PipeWire.
itself. It executes a series of commands listed in the config
file.
- The config file in the default location is used but the
- environment variables PIPEWIRE_CONFIG_DIR, PIPEWIRE_CONFIG_PREFIX
+
The config files are loaded in the order listed in the SYNOPSIS.
+ The environment variables PIPEWIRE_CONFIG_DIR, PIPEWIRE_CONFIG_PREFIX
and PIPEWIRE_CONFIG_NAME can be used to specify an alternative config
directory, subdirectory and file respectively.