diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-07-19 18:11:12 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-07-19 18:11:12 +0000 |
| commit | 2b31a900d67506592aecd9c0d59ad997d7977deb (patch) | |
| tree | 0250bc0b7f01982ce9f3b55886b2915e7fc4f21a | |
| parent | 45a9a8bcb5572188ca9121e4f11bfeb5c932411f (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
| -rw-r--r-- | src/daemon/daemon.conf.in | 4 | ||||
| -rwxr-xr-x | src/daemon/esdcompat.in | 2 | ||||
| -rw-r--r-- | src/pulse/client.conf.in | 8 |
3 files changed, 10 insertions, 4 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" diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in index 21786ebf..3e008766 100644 --- a/src/pulse/client.conf.in +++ b/src/pulse/client.conf.in @@ -21,7 +21,7 @@ ## commented out. Use either ; or # for commenting ## Path to the pulseaudio daemon to run when autospawning. -; daemon-binary = @PULSEAUDIO_BINARY@ +; daemon-binary = @PA_BINARY@ ## Extra arguments to pass to the pulseaudio daemon ; extra-arguments = --log-target=syslog --exit-idle-time=5 @@ -37,3 +37,9 @@ ## Autospawn daemons? ; autospawn = 0 + +### Cookie file +; cookie-file = + +### Access group +; access-group = |