From 0387b30994185a44e6df737c529ddda24325c671 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 25 May 2006 13:56:14 +0000
Subject: Use only the basename of libpolypdsp.so so that it will work on
 multi-arch systems.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@969 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/Makefile.am    | 12 +++---------
 src/utils/padsp    | 30 ++++++++++++++++++++++++++++++
 src/utils/padsp.in | 30 ------------------------------
 3 files changed, 33 insertions(+), 39 deletions(-)
 create mode 100644 src/utils/padsp
 delete mode 100644 src/utils/padsp.in

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index a298397b..16b5e9e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,7 +78,7 @@ EXTRA_DIST = \
 		daemon/default.pa.in \
 		depmod.py \
 		daemon/esdcompat.sh.in \
-		utils/padsp.in \
+		utils/padsp \
 		modules/module-defs.h.m4
 
 polypconf_DATA = \
@@ -453,14 +453,11 @@ libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VER
 #         OSS emulation           #
 ###################################
 
-CLEANFILES=
-
 if HAVE_OSS
 
 lib_LTLIBRARIES += libpolypdsp.la
 
-CLEANFILES += padsp
-bin_SCRIPTS += padsp
+bin_SCRIPTS += utils/padsp
 
 endif
 
@@ -469,9 +466,6 @@ libpolypdsp_la_CFLAGS = $(AM_CFLAGS)
 libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la
 libpolypdsp_la_LDFLAGS = -avoid-version
 
-padsp: utils/padsp.in Makefile
-	sed -e 's,@LIBPOLYPDSP\@,$(libdir)/libpolypdsp.so,g' < $< > $@
-
 ###################################
 #      Daemon core library        #
 ###################################
@@ -1165,7 +1159,7 @@ suid: polypaudio
 	chown root $<
 	chmod u+s $<
 
-CLEANFILES+=esdcompat.sh client.conf default.pa daemon.conf
+CLEANFILES = esdcompat.sh client.conf default.pa daemon.conf
 
 esdcompat.sh: daemon/esdcompat.sh.in Makefile
 	sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
diff --git a/src/utils/padsp b/src/utils/padsp
new file mode 100644
index 00000000..9f38cf3d
--- /dev/null
+++ b/src/utils/padsp
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# $Id$
+#
+# This file is part of polypaudio.
+#
+# polypaudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser 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 Lesser 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.
+
+if [ x"$LD_PRELOAD" = x ] ; then
+   LD_PRELOAD="libpolypdsp.so"
+else
+   LD_PRELOAD="$LD_PRELOAD libpolypdsp.so"
+fi
+
+export LD_PRELOAD
+
+exec "$@"
diff --git a/src/utils/padsp.in b/src/utils/padsp.in
deleted file mode 100644
index d82e92fe..00000000
--- a/src/utils/padsp.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# $Id$
-#
-# This file is part of polypaudio.
-#
-# polypaudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser 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 Lesser 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.
-
-if [ x"$LD_PRELOAD" = x ] ; then
-   LD_PRELOAD="@LIBPOLYPDSP@"
-else
-   LD_PRELOAD="$LD_PRELOAD @LIBPOLYPDSP@"
-fi
-
-export LD_PRELOAD
-
-exec "$@"
-- 
cgit