--- arts-1.5.4/artsc/artsdsp.in.artsdsp-args	2005-09-10 04:13:34.000000000 -0400
+++ arts-1.5.4/artsc/artsdsp.in	2006-09-04 08:06:43.000000000 -0400
@@ -89,34 +89,30 @@ if test "$verbose" = 1; then
     fi
 fi
 
-# setup artsdsp preload to hijack calls made to /dev/dsp
-origargs="$@"
-binary=`which $1`
+# determine arch-specific libdir name
+system=`uname -s`
+case $system in
+Linux)
+  elf64=no
+  binary=`which $1`
+  case "`file -L $binary`" in
+    *"ELF 64"*) elf64=yes;;
+    *"ELF 32"*) elf64=no;;
+    *) echo "artsdsp works only for binaries"; exit 1;;
+  esac
+  ;;
+esac
 machine=`uname -m`
-
-set `file -L $binary`
-
-case $2 in
-    ELF)
-       ;;
-    *)
-       echo "artsdsp works only for binaries"
-       exit 1
-    esac
-
-case $3 in
-    32-bit)
-       arch_libdir=lib
-       ;;
-    64-bit)
-       arch_libdir=lib64
-       ;;
-    *)
-       exit 1
+case $machine:$elf64 in
+  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+    arch_libdir=lib64
+    ;;
+  *)
+    arch_libdir=lib
+    ;;
 esac
 
-set $origargs
-
+# setup artsdsp preload to hijack calls made to /dev/dsp
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=${prefix}/${arch_libdir}