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 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/Makefile.am')

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' \
-- 
cgit