From 6d2054458ed8bbdcdc4bdf0c57e4294fdc8a7676 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Sep 2004 20:41:49 +0000
Subject: place full binary path in default.pa's shebang line

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@236 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 polyp/Makefile.am   |  5 ++++-
 polyp/default.pa    | 62 -----------------------------------------------------
 polyp/default.pa.in | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 63 deletions(-)
 delete mode 100755 polyp/default.pa
 create mode 100755 polyp/default.pa.in

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index c5391311..4e075468 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.in client.conf.in depmod.py esdcompat.sh.in
+EXTRA_DIST = default.pa.in daemon.conf.in client.conf.in depmod.py esdcompat.sh.in
 bin_PROGRAMS = polypaudio pacat pactl
 bin_SCRIPTS = esdcompat.sh
 noinst_PROGRAMS = \
@@ -557,6 +557,9 @@ esdcompat.sh: esdcompat.sh.in Makefile
 client.conf: client.conf.in Makefile
 	sed -e 's,@POLYPAUDIO_BINARY\@,$(bindir)/polypaudio,g' < $< > $@
 
+default.pa: default.pa.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' < $< > $@
diff --git a/polyp/default.pa b/polyp/default.pa
deleted file mode 100755
index a3aaa7c8..00000000
--- a/polyp/default.pa
+++ /dev/null
@@ -1,62 +0,0 @@
-#!./polypaudio -nF 
-
-#
-# This file is part of polypaudio.
-#
-# polypaudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# polypaudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with polypaudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-
-# Load audio drivers statically
-
-#load-module module-alsa-sink
-load-module module-alsa-source device=plughw:1,0
-load-module module-oss device="/dev/dsp" sink_name=output source_name=input record=0
-#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#load-module module-pipe-sink
-
-# Load audio drivers automatically on access
-
-#add-autoload-sink output module-oss device="/dev/dsp" sink_name=output source_name=input
-#add-autoload-source input module-oss device="/dev/dsp" sink_name=output source_name=input
-#add-autoload-sink output module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#add-autoload-source input module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#add-autoload-sink output module-alsa-sink sink_name=output
-#add-autoload-source input module-alsa-source source_name=input
-
-# Load several protocols
-load-module module-esound-protocol-tcp
-#load-module module-simple-protocol-tcp
-load-module module-native-protocol-unix
-#load-module module-cli-protocol-unix
-#load-module module-esound-protocol-unix
-
-# Load the CLI module
-load-module module-cli
-
-# Make some devices default
-set-default-sink output
-set-default-source input
-
-.nofail
-
-# Load something to the sample cache
-load-sample /usr/share/sounds/KDE_Notify.wav x11-bell
-
-# Load X11 bell module
-load-module module-x11-bell sample=x11-bell sink=output
-
-#load-module module-pipe-source
-#load-module module-pipe-sink
-
diff --git a/polyp/default.pa.in b/polyp/default.pa.in
new file mode 100755
index 00000000..54feb5ef
--- /dev/null
+++ b/polyp/default.pa.in
@@ -0,0 +1,62 @@
+#!@POLYPAUDIO_BINARY@ -nF 
+
+#
+# This file is part of polypaudio.
+#
+# polypaudio is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# polypaudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with polypaudio; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+
+# Load audio drivers statically
+
+#load-module module-alsa-sink
+load-module module-alsa-source device=plughw:1,0
+load-module module-oss device="/dev/dsp" sink_name=output source_name=input record=0
+#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+#load-module module-pipe-sink
+
+# Load audio drivers automatically on access
+
+#add-autoload-sink output module-oss device="/dev/dsp" sink_name=output source_name=input
+#add-autoload-source input module-oss device="/dev/dsp" sink_name=output source_name=input
+#add-autoload-sink output module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+#add-autoload-source input module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+#add-autoload-sink output module-alsa-sink sink_name=output
+#add-autoload-source input module-alsa-source source_name=input
+
+# Load several protocols
+load-module module-esound-protocol-tcp
+#load-module module-simple-protocol-tcp
+load-module module-native-protocol-unix
+#load-module module-cli-protocol-unix
+#load-module module-esound-protocol-unix
+
+# Load the CLI module
+load-module module-cli
+
+# Make some devices default
+set-default-sink output
+set-default-source input
+
+.nofail
+
+# Load something to the sample cache
+load-sample /usr/share/sounds/KDE_Notify.wav x11-bell
+
+# Load X11 bell module
+load-module module-x11-bell sample=x11-bell sink=output
+
+#load-module module-pipe-source
+#load-module module-pipe-sink
+
-- 
cgit