build-sys: Move some more defines to configure.ac

6 files changed, 13 insertions, 15 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index 8457e03a..dd228f7d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -15,8 +15,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-pulseconfdir=$(sysconfdir)/pulse
-
 CLEANFILES = \
 	$(noinst_DATA)
 
@@ -35,7 +33,7 @@ noinst_DATA = \
 	default.pa.5.xml
 
 %.xml: %.xml.in Makefile
-	$(AM_V_GEN) sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \
+	$(AM_V_GEN) sed -e 's,@PA_DEFAULT_CONFIG_DIR\@,$(PA_DEFAULT_CONFIG_DIR),g' \
 	    -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
             -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
 
diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in
index 4caad7c9..1ec618d5 100644
--- a/man/default.pa.5.xml.in
+++ b/man/default.pa.5.xml.in
@@ -26,13 +26,13 @@ USA.
   <synopsis>
     <p><file>~/.pulse/default.pa</file></p>
 
-    <p><file>@pulseconfdir@/default.pa</file></p>
+    <p><file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file></p>
   </synopsis>
 
   <description>
     <p>The PulseAudio sound server interprets the file
     <file>~/.pulse/default.pa</file> on startup, and when that file
-    doesn't exist <file>@pulseconfdir@/default.pa</file>. It
+    doesn't exist <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. It
     should contain directives in the PulseAudio CLI languages, as
     documented on <url href="http://pulseaudio.org/wiki/CLI"/>.</p>
 
diff --git a/man/pax11publish.1.xml.in b/man/pax11publish.1.xml.in
index 3b40b978..be9ce0b8 100644
--- a/man/pax11publish.1.xml.in
+++ b/man/pax11publish.1.xml.in
@@ -84,7 +84,7 @@ USA.
       the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE
       environment variables and combines them with the data from
       <file>~/.pulse/client.conf</file> (or
-      <file>@pulseconfdir@/client.conf</file> if that file does not
+      <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file> if that file does not
       exist). If specific options are passed on the command line
       (<opt>-S</opt>, <opt>-O</opt>, <opt>-I</opt>, <opt>-c</opt>, see
       below), they take precedence. Also uploads the local
diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in
index 739fae46..dc9ae0bd 100644
--- a/man/pulse-client.conf.5.xml.in
+++ b/man/pulse-client.conf.5.xml.in
@@ -26,14 +26,14 @@ USA.
   <synopsis>
     <p><file>~/.pulse/client.conf</file></p>
 
-    <p><file>@pulseconfdir@/client.conf</file></p>
+    <p><file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file></p>
   </synopsis>
 
   <description>
     <p>The PulseAudio client library reads configuration directives from
     a file <file>~/.pulse/client.conf</file> on startup and when that
     file doesn't exist from
-    <file>@pulseconfdir@/client.conf</file>.</p>
+    <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>.</p>
 
     <p>The configuration file is a simple collection of variable
     declarations. If the configuration file parser encounters either ;
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index ded3cb48..6fcdd0ec 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -26,14 +26,14 @@ USA.
   <synopsis>
     <p><file>~/.pulse/daemon.conf</file></p>
 
-    <p><file>@pulseconfdir@/daemon.conf</file></p>
+    <p><file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file></p>
   </synopsis>
 
   <description>
     <p>The PulseAudio sound server reads configuration directives from
     a file <file>~/.pulse/daemon.conf</file> on startup and when that
     file doesn't exist from
-    <file>@pulseconfdir@/daemon.conf</file>. Please note that the
+    <file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>. Please note that the
     server also reads a configuration script on startup
     <file>default.pa</file> which also contains runtime configuration
     directives.</p>
@@ -262,8 +262,8 @@ USA.
       default script file. The default behaviour is to load
       <file>~/.pulse/default.pa</file>, and if that file does not
       exist fall back to the system wide installed version
-      <file>@pulseconfdir@/default.pa</file>. If run in system-wide
-      mode the file <file>@pulseconfdir@/system.pa</file> is used
+      <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. If run in system-wide
+      mode the file <file>@PA_DEFAULT_CONFIG_DIR@/system.pa</file> is used
       instead. If <opt>-n</opt> is passed on the command line
       or <opt>default-script-file=</opt> is disabled the default
       configuration script is ignored.</p>
diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index 8810e90c..4e58ffb4 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -314,21 +314,21 @@ USA.
   <section name="Files">
 
     <p><file>~/.pulse/daemon.conf</file>,
-    <file>@pulseconfdir@/daemon.conf</file>: configuration settings
+    <file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>: configuration settings
     for the PulseAudio daemon. If the version in the user's home
     directory does not exist the global configuration file is
     loaded. See <manref name="pulse-daemon.conf" section="5"/> for
     more information.</p>
 
     <p><file>~/.pulse/default.pa</file>,
-    <file>@pulseconfdir@/default.pa</file>: the default configuration
+    <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>: the default configuration
     script to execute when the PulseAudio daemon is started. If the
     version in the user's home directory does not exist the global
     configuration script is loaded. See <manref name="default.pa"
     section="5"/> for more information.</p>
 
     <p><file>~/.pulse/client.conf</file>,
-    <file>@pulseconfdir@/client.conf</file>: configuration settings
+    <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>: configuration settings
     for PulseAudio client applications. If the version in the user's
     home directory does not exist the global configuration file is
     loaded.  See <manref name="pulse-client.conf" section="5"/> for