]> git.alsa-project.org Git - alsa-oss.git/commitdiff
Revert "Fix path to libaoss.so."
authorTakashi Iwai <tiwai@suse.de>
Mon, 28 Apr 2014 09:46:02 +0000 (11:46 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Apr 2014 09:47:24 +0000 (11:47 +0200)
This reverts commit 53e8f2dace57cd428e046059ac7172e58d206429.

This breaks the multi-arch usage.  The original code uses ${exec_prefix}
intentionally together with \$LIB (note the backslash here), so that
ld.so itself expands the right path for both 32 and 64bit archs.

Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=874331
Signed-off-by: Takashi Iwai <tiwai@suse.de>
alsa/aoss.in

index d8e1d6d850abe8883e576b27841a94a77152bf38..c551431c3d90a2b61ee66872576d37f5da4c33de 100644 (file)
@@ -6,8 +6,8 @@
 
 if [ -d /proc/asound ]; then
   prefix=@prefix@
-  libdir=@libdir@
-  LD_PRELOAD=${libdir}/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
+  exec_prefix=@exec_prefix@
+  LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
 else
   exec "$@"
 fi