1 files changed, 18 insertions, 10 deletions
diff --git a/development/quilt/quilt.SlackBuild b/development/quilt/quilt.SlackBuild
index f45b5e8d2a98a..081ebc137de4a 100644
--- a/development/quilt/quilt.SlackBuild
+++ b/development/quilt/quilt.SlackBuild
@@ -24,7 +24,7 @@
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
-PRGNAME=quilt
+PRGNAM=quilt
 VERSION=0.46
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
@@ -32,13 +32,18 @@ TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAME
+PKG=$TMP/package-$PRGNAM
 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
@@ -46,9 +51,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAME-$VERSION
-tar xvf $CWD/$PRGNAME-$VERSION.tar.gz
-cd $PRGNAME-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
@@ -56,7 +61,9 @@ CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --build=$ARCH-slackware-linux
 
 make
 make install BUILD_ROOT=$PKG docdir=/usr/doc
@@ -65,17 +72,18 @@ make install BUILD_ROOT=$PKG docdir=/usr/doc
 mv $PKG/etc/quilt.quiltrc $PKG/etc/quilt.quiltrc.new
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 ( find $PKG/usr/man -type f -name "*.?" | xargs gzip -9f )
 
-cp -a AUTHORS COPYING TODO quilt.changes $PKG/usr/doc/$PRGNAME-$VERSION
-cat $CWD/$PRGNAME.SlackBuild > $PKG/usr/doc/$PRGNAME-$VERSION/$PRGNAME.SlackBuild
+cp -a AUTHORS COPYING TODO quilt.changes $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}