Use $LIB for LD_PRELOAD path in aoss
authorTakashi Iwai <tiwai@suse.de>
Fri, 2 Sep 2005 13:12:02 +0000 (13:12 +0000)
committerTakashi Iwai <tiwai@suse.de>
Fri, 2 Sep 2005 13:12:02 +0000 (13:12 +0000)
Use $LIB for LD_PRELOAD path in aoss (bug#1390)

alsa/Makefile.am
alsa/aoss.in
alsa/aoss.old.in [new file with mode: 0644]
configure.in

index 78194b5..8ce94f7 100644 (file)
@@ -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@
index 98c7ddc..ff707c1 100644 (file)
@@ -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
@@ -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 "$@"
index 39b3583..d9b71ca 100644 (file)
@@ -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)