From 24f378150766faf50445427d6eb02f363a9afc24 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 17 Sep 2004 19:52:38 +0000 Subject: [PATCH] make daemon.conf/client.conf autogenerated git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@211 fefdeb5f-60dc-0310-8127-8f9354f1896f --- polyp/Makefile.am | 9 ++++++++- polyp/{client.conf => client.conf.in} | 2 +- polyp/{daemon.conf => daemon.conf.in} | 0 3 files changed, 9 insertions(+), 2 deletions(-) rename polyp/{client.conf => client.conf.in} (97%) rename polyp/{daemon.conf => daemon.conf.in} (100%) diff --git a/polyp/Makefile.am b/polyp/Makefile.am index d49c7c48..76f4f2c7 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -32,7 +32,7 @@ AM_CFLAGS+=-DPOLYPAUDIO_BINARY=\"$(bindir)/polypaudio\" AM_LDADD=$(PTHREAD_LIBS) -lm AM_LIBADD=$(PTHREAD_LIBS) -lm -EXTRA_DIST = default.pa daemon.conf client.conf config depmod.py esdcompat.sh.in +EXTRA_DIST = default.pa daemon.conf.in client.conf.in config depmod.py esdcompat.sh.in bin_PROGRAMS = polypaudio pacat pactl bin_SCRIPTS = esdcompat.sh noinst_PROGRAMS = \ @@ -541,6 +541,13 @@ esdcompat.sh: esdcompat.sh.in Makefile sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@POLYPAUDIO_BINARY\@,$(bindir)/polypaudio,g' < $< > $@ + +client.conf: client.conf.in Makefile + sed -e 's,@POLYPAUDIO_BINARY\@,$(bindir)/polypaudio,g' < $< > $@ + +daemon.conf: daemon.conf.in Makefile + sed -e 's,@DLSEARCHPATH\@,$(modlibdir),g' \ + -e 's,@DEFAULT_CONFIG_FILE\@,$(polypconfdir)/daemon.conf,g' < $< > $@ install-exec-hook: chown root:root $(DESTDIR)$(bindir)/polypaudio diff --git a/polyp/client.conf b/polyp/client.conf.in similarity index 97% rename from polyp/client.conf rename to polyp/client.conf.in index 070d75bd..7ba6549b 100644 --- a/polyp/client.conf +++ b/polyp/client.conf.in @@ -21,7 +21,7 @@ ## commented out. Use either ; or # for commenting ## Path to the polypaudio daemon to run when autospawning. -; daemon_binary = @POLYPAUDIO_BINARY +; daemon_binary = @POLYPAUDIO_BINARY@ ## Extra arguments to pass to the polypaudio daemon ; extra_arguments = --daemonize=yes --log-target=syslog diff --git a/polyp/daemon.conf b/polyp/daemon.conf.in similarity index 100% rename from polyp/daemon.conf rename to polyp/daemon.conf.in -- 2.39.2