mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use only the basename of libpolypdsp.so so that it will work on multi-arch

Browse source 
systems.


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@969 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-05-25 13:56:14 +00:00
parent 1799b7ac33
commit 0387b30994
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Makefile.am
View file

@ -78,7 +78,7 @@ EXTRA_DIST = \
daemon/default.pa.in \ daemon/default.pa.in \
depmod.py \ depmod.py \
daemon/esdcompat.sh.in \ daemon/esdcompat.sh.in \
utils/padsp.in \ utils/padsp \
modules/module-defs.h.m4 modules/module-defs.h.m4
polypconf_DATA = \ polypconf_DATA = \
@ -453,14 +453,11 @@ libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VER
# OSS emulation # # OSS emulation #
################################### ###################################
CLEANFILES=
if HAVE_OSS if HAVE_OSS
lib_LTLIBRARIES += libpolypdsp.la lib_LTLIBRARIES += libpolypdsp.la
CLEANFILES += padsp bin_SCRIPTS += utils/padsp
bin_SCRIPTS += padsp
endif endif
@ -469,9 +466,6 @@ libpolypdsp_la_CFLAGS = $(AM_CFLAGS)
libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la
libpolypdsp_la_LDFLAGS = -avoid-version libpolypdsp_la_LDFLAGS = -avoid-version
padsp: utils/padsp.in Makefile
sed -e 's,@LIBPOLYPDSP\@,$(libdir)/libpolypdsp.so,g' < $< > $@
################################### ###################################
# Daemon core library # # Daemon core library #
################################### ###################################
@ -1165,7 +1159,7 @@ suid: polypaudio
chown root $< chown root $<
chmod u+s $< 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 esdcompat.sh: daemon/esdcompat.sh.in Makefile
sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \

4
src/utils/padsp.in → src/utils/padsp
View file

@ -20,9 +20,9 @@
# USA. # USA.
if [ x"$LD_PRELOAD" = x ] ; then if [ x"$LD_PRELOAD" = x ] ; then
LD_PRELOAD="@LIBPOLYPDSP@" LD_PRELOAD="libpolypdsp.so"
else else
LD_PRELOAD="$LD_PRELOAD @LIBPOLYPDSP@" LD_PRELOAD="$LD_PRELOAD libpolypdsp.so"
fi fi
export LD_PRELOAD export LD_PRELOAD