1 files changed, 11 insertions, 8 deletions
diff --git a/academic/ladr/ladr.SlackBuild b/academic/ladr/ladr.SlackBuild
index 2b88462210ac6..352f01c14dca0 100644
--- a/academic/ladr/ladr.SlackBuild
+++ b/academic/ladr/ladr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ladr
 
-# Copyright 2007-2008 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2007-2010 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ladr
-VERSION=2008_09A
+VERSION=2009_11A
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -38,10 +38,13 @@ SRC_VERSION=$(echo $VERSION | tr _ -)
 
 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
@@ -65,12 +68,12 @@ patch -p1 -i $CWD/ladr-libtoolize.diff
 
 XFLAGS="$SLKCFLAGS" make all MAKEFLAGS="-j1"
 
-mkdir -p $PKG/usr/{bin,lib}
+mkdir -p $PKG/usr/{bin,lib$LIBDIRSUFFIX}
 install -m 0755 ./bin/* $PKG/usr/bin/
-install -m 0755 ./ladr/libladr.la $PKG/usr/lib/
-install -m 0755 ./ladr/.libs/libladr.so.4.0.0 $PKG/usr/lib/
-ln -s /usr/lib/libladr.so.4.0.0 $PKG/usr/lib/libladr.so.4
-ln -s /usr/lib/libladr.so.4.0.0 $PKG/usr/lib/libladr.so
+install -m 0755 ./ladr/libladr.la $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 0755 ./ladr/.libs/libladr.so.4.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
+ln -s /usr/lib$LIBDIRSUFFIX/libladr.so.4.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libladr.so.4
+ln -s /usr/lib$LIBDIRSUFFIX/libladr.so.4.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libladr.so
 
 rm -f $PKG/usr/bin/proof3fo.xsl
 chmod 755 $PKG/usr/bin/gvizify
@@ -94,4 +97,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}