3 files changed, 14 insertions, 8 deletions
diff --git a/audio/ladspa_sdk/ladspa_sdk.SlackBuild b/audio/ladspa_sdk/ladspa_sdk.SlackBuild
index abc7870f7c..600f91b49a 100644
--- a/audio/ladspa_sdk/ladspa_sdk.SlackBuild
+++ b/audio/ladspa_sdk/ladspa_sdk.SlackBuild
@@ -28,7 +28,7 @@
 PRGNAM=ladspa_sdk
 VERSION=1.13
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -38,10 +38,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -58,17 +61,24 @@ chmod -R u+w,go+r-w,a-s .
 cd src
   make \
     CFLAGS="$SLKCFLAGS -I. -Wall -Werror -fPIC" \
-    INSTALL_PLUGINS_DIR="/usr/lib/ladspa" \
+    INSTALL_PLUGINS_DIR="/usr/lib${LIBDIRSUFFIX}/ladspa" \
     INSTALL_BINARY_DIR="/usr/bin"
 
   make install \
-    INSTALL_PLUGINS_DIR="$PKG/usr/lib/ladspa" \
+    INSTALL_PLUGINS_DIR="$PKG/usr/lib${LIBDIRSUFFIX}/ladspa" \
     INSTALL_BINARY_DIR="$PKG/usr/bin" \
     INSTALL_INCLUDE_DIR="$PKG/usr/include"
 cd -
 
 mkdir -p $PKG/etc/profile.d/
-cp $CWD/profile.d/* $PKG/etc/profile.d/
+cat << EOF > $PKG/etc/profile.d/ladspa.csh
+#!/bin/csh
+setenv LADSPA_PATH /usr/lib${LIBDIRSUFFIX}/ladspa
+EOF
+cat << EOF > $PKG/etc/profile.d/ladspa.sh
+#!/bin/sh
+export LADSPA_PATH=/usr/lib${LIBDIRSUFFIX}/ladspa
+EOF
 chmod 0755 $PKG/etc/profile.d/*
 
 # Cleanup files left in /tmp by make
diff --git a/audio/ladspa_sdk/profile.d/ladspa.csh b/audio/ladspa_sdk/profile.d/ladspa.csh
deleted file mode 100644
index 7a07cd6b70..0000000000
--- a/audio/ladspa_sdk/profile.d/ladspa.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/csh
-setenv LADSPA_PATH /usr/lib/ladspa
diff --git a/audio/ladspa_sdk/profile.d/ladspa.sh b/audio/ladspa_sdk/profile.d/ladspa.sh
deleted file mode 100644
index 1079c47718..0000000000
--- a/audio/ladspa_sdk/profile.d/ladspa.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-LADSPA_PATH=/usr/lib/ladspa ; export LADSPA_PATH