summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/abook/abook.SlackBuild14
-rw-r--r--office/abook/abook.info4
2 files changed, 13 insertions, 5 deletions
diff --git a/office/abook/abook.SlackBuild b/office/abook/abook.SlackBuild
index 84a04aa07d..972d352bbb 100644
--- a/office/abook/abook.SlackBuild
+++ b/office/abook/abook.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for abook
# Copyright 2006 Martin Lefebvre <dadexter@gmail.com>
-# Copyright 2007-2008 Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2007-2009 Michiel van Wessem, Manchester, United Kingdom
# All rights reserved.
#
@@ -36,9 +36,14 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
# Exit on most errors.
@@ -62,6 +67,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--mandir=/usr/man \
--localstatedir=/var \
@@ -83,4 +89,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/office/abook/abook.info b/office/abook/abook.info
index a1dc6ee150..0703da09c6 100644
--- a/office/abook/abook.info
+++ b/office/abook/abook.info
@@ -1,8 +1,10 @@
PRGNAM="abook"
VERSION="0.5.6"
HOMEPAGE="http://abook.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/abook/abook-0.5.6.tar.gz"
+DOWNLOAD="http://dl.sourceforge.net/abook/abook-0.5.6.tar.gz"
+DOWNLOAD_x86_64=""
MD5SUM="87d25df96864a7c507a4965e6d1da49d"
+MD5SUM_x86_64=""
MAINTAINER="Michiel van Wessem"
EMAIL="michiel@slackbuilds.org"
APPROVED="rworkman"