3 files changed, 28 insertions, 18 deletions
diff --git a/libraries/ffcall/ffcall.SlackBuild b/libraries/ffcall/ffcall.SlackBuild
index 49fac96eb0..310897e1ca 100644
--- a/libraries/ffcall/ffcall.SlackBuild
+++ b/libraries/ffcall/ffcall.SlackBuild
@@ -22,16 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
-# Bail out if we encounter an error
-set -e
-
 PRGNAM=ffcall
 VERSION=1.10
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -39,32 +35,44 @@ 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
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -zxvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
                                         
 make
 make DESTDIR=$PKG install
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | 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
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 gzip -9 $PKG/usr/man/man?/*
@@ -80,4 +88,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}
diff --git a/libraries/ffcall/ffcall.info b/libraries/ffcall/ffcall.info
index 296d74a300..66ffbc85eb 100644
--- a/libraries/ffcall/ffcall.info
+++ b/libraries/ffcall/ffcall.info
@@ -3,6 +3,8 @@ VERSION="1.10"
 HOMEPAGE="http://www.haible.de/bruno/packages-ffcall.html"
 DOWNLOAD="http://www.haible.de/bruno/gnu/ffcall-1.10.tar.gz"
 MD5SUM="2db95007e901f3bc2ae7e5a9fe9ebea4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Martin Lefebvre"
 EMAIL="dadexter@gmail.com"
 APPROVED="rworkman"
diff --git a/libraries/ffcall/slack-desc b/libraries/ffcall/slack-desc
index cccf195743..d71a657d69 100644
--- a/libraries/ffcall/slack-desc
+++ b/libraries/ffcall/slack-desc
@@ -10,10 +10,10 @@ ffcall: ffcall (Foreign Function Call library)
 ffcall: 
 ffcall: A collection of four libraries used to build foreign function call
 ffcall: interfaces in embedded interpreters.  
-ffcall: 
-ffcall: 
-ffcall: 
-ffcall: 
-ffcall: 
-ffcall: 
-ffcall: 
+ffcall:
+ffcall:
+ffcall:
+ffcall:
+ffcall:
+ffcall:
+ffcall: