From 9916731b29f07a52451d9d663a7d365ead8e9dfe Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 2 Sep 2005 13:12:02 +0000
Subject: [PATCH] Use $LIB for LD_PRELOAD path in aoss

Use $LIB for LD_PRELOAD path in aoss (bug#1390)
---
 alsa/Makefile.am | 1 +
 alsa/aoss.in     | 2 +-
 alsa/aoss.old.in | 9 +++++++++
 configure.in     | 3 ++-
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 alsa/aoss.old.in

diff --git a/alsa/Makefile.am b/alsa/Makefile.am
index 78194b5..8ce94f7 100644
--- 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 98c7ddc..ff707c1 100644
--- 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
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 39b3583..d9b71ca 100644
--- 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)
-- 
2.47.1