[polypaudio-commits] r969 - in /trunk/src: Makefile.am utils/padsp utils/padsp.in

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Thu May 25 15:56:14 2006
New Revision: 969

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=969&root=polypaudio&view=rev
Log:
Use only the basename of libpolypdsp.so so that it will work on multi-arch
systems.

Added:
    trunk/src/utils/padsp
      - copied, changed from r968, trunk/src/utils/padsp.in
Removed:
    trunk/src/utils/padsp.in
Modified:
    trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=969&root=polypaudio&r1=968&r2=969&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu May 25 15:56:14 2006
@@ -78,7 +78,7 @@
 		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 @@
 #         OSS emulation           #
 ###################################
 
-CLEANFILES=
-
 if HAVE_OSS
 
 lib_LTLIBRARIES += libpolypdsp.la
 
-CLEANFILES += padsp
-bin_SCRIPTS += padsp
+bin_SCRIPTS += utils/padsp
 
 endif
 
@@ -468,9 +465,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, at LIBPOLYPDSP\@,$(libdir)/libpolypdsp.so,g' < $< > $@
 
 ###################################
 #      Daemon core library        #
@@ -1165,7 +1159,7 @@
 	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, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \

Copied: trunk/src/utils/padsp (from r968, trunk/src/utils/padsp.in)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/padsp?p2=trunk/src/utils/padsp&p1=trunk/src/utils/padsp.in&r1=968&r2=969&rev=969&root=polypaudio&view=diff
==============================================================================
--- trunk/src/utils/padsp.in (original)
+++ trunk/src/utils/padsp Thu May 25 15:56:14 2006
@@ -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