summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-07-19 18:11:12 +0000
committerLennart Poettering <lennart@poettering.net>2006-07-19 18:11:12 +0000
commit2b31a900d67506592aecd9c0d59ad997d7977deb (patch)
tree0250bc0b7f01982ce9f3b55886b2915e7fc4f21a /src/daemon
parent45a9a8bcb5572188ca9121e4f11bfeb5c932411f (diff)
update @@ tokens according to recent Makefile.am change
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1107 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/daemon.conf.in4
-rwxr-xr-xsrc/daemon/esdcompat.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 6e55c0ee..30628969 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -52,11 +52,11 @@
## The path were to look for dynamic shared objects (DSOs aka
## plugins). You may specify more than one path seperated by
## colons.
-; dl-search-path = @DLSEARCHPATH@
+; dl-search-path = @PA_DLSEARCHPATH@
## The default script file to load. Specify an empty string for not
## loading a default script file. The
-; default-script-file = @DEFAULT_CONFIG_FILE@
+; default-script-file = @PA_DEFAULT_CONFIG_FILE@
## The default log target. Use either "stderr", "syslog" or
## "auto". The latter is equivalent to "sylog" in case daemonize is
diff --git a/src/daemon/esdcompat.in b/src/daemon/esdcompat.in
index edae8615..ece1f4f9 100755
--- a/src/daemon/esdcompat.in
+++ b/src/daemon/esdcompat.in
@@ -95,4 +95,4 @@ EOF
shift
done
-eval "exec '@PULSEAUDIO_BINARY@'$ARGS"
+eval "exec '@PA_BINARY@'$ARGS"