Use $LIB for LD_PRELOAD path in aoss

Use $LIB for LD_PRELOAD path in aoss (bug#1390)

diff --git a/alsa/Makefile.am b/alsa/Makefile.am
index 78194b519478f8716524b2f64b1e4a5d8b066712..8ce94f7e90cd245e3c9c7f448ec3eb8444099074 100644 (file)
--- a/alsa/Makefile.am
+++ b/alsa/Makefile.am
@@ -1,5 +1,6 @@
 lib_LTLIBRARIES = libalsatoss.la libaoss.la
 bin_SCRIPTS = aoss
+noinst_SCRIPTS = aoss.old
 man_MANS = aoss.1
 EXTRA_DIST = aoss.1
 COMPATNUM=@LIBTOOL_VERSION_INFO@

diff --git a/alsa/aoss.in b/alsa/aoss.in
index 98c7ddcb8bf3e1951b2885644f87eeea6bb4e995..ff707c19469e3e8d8c0debf4ab7333c2fc73ec1a 100644 (file)
--- a/alsa/aoss.in
+++ b/alsa/aoss.in
@@ -6,4 +6,4 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LD_PRELOAD=@libdir@/libaoss.so exec "$@"
+LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so exec "$@"

diff --git a/alsa/aoss.old.in b/alsa/aoss.old.in
new file mode 100644 (file)
index 0000000..98c7ddc
--- /dev/null
+++ b/alsa/aoss.old.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# A simple script to facilitate the use of the OSS compatibility library.
+# Usage:
+#      aoss <command> <command options and arguments>
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+LD_PRELOAD=@libdir@/libaoss.so exec "$@"

diff --git a/configure.in b/configure.in
index 39b3583dd62dc400d4a20f83e922995fdb346631..d9b71cac1e61edc4f3ebe9c5cb58c647a7f183f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,5 +33,6 @@ if test "$with_aoss" = "yes"; then
   LIBS="$OLD_LIBS"
 fi
 
-AC_OUTPUT(Makefile alsa/Makefile alsa/aoss oss-redir/Makefile test/Makefile \
+AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \
+         oss-redir/Makefile test/Makefile \
           alsa/testaoss test/testaoss)