diff options
| author | Pierre Ossman <ossman@cendio.se> | 2006-05-25 13:56:14 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2006-05-25 13:56:14 +0000 |
| commit | 0387b30994185a44e6df737c529ddda24325c671 (patch) | |
| tree | fe5e551bd1d4cf84359c1baf9f4e2f39dbe2b5df /src | |
| parent | 1799b7ac332e0309437c41c676358078cc1f659c (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/utils/padsp (renamed from src/utils/padsp.in) | 4 |
2 files changed, 5 insertions, 11 deletions
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.in b/src/utils/padsp index d82e92fe..9f38cf3d 100644 --- a/src/utils/padsp.in +++ b/src/utils/padsp @@ -20,9 +20,9 @@ # USA. if [ x"$LD_PRELOAD" = x ] ; then - LD_PRELOAD="@LIBPOLYPDSP@" + LD_PRELOAD="libpolypdsp.so" else - LD_PRELOAD="$LD_PRELOAD @LIBPOLYPDSP@" + LD_PRELOAD="$LD_PRELOAD libpolypdsp.so" fi export LD_PRELOAD |