3 files changed, 13 insertions, 7 deletions
diff --git a/libraries/ebook-tools/README b/libraries/ebook-tools/README
index 82b8c0ecdcfba..7048e29543a27 100644
--- a/libraries/ebook-tools/README
+++ b/libraries/ebook-tools/README
@@ -1,5 +1,2 @@
 This package includes utilities for a better ebook-handling
 ebook-tools: as well as libepub.
-
-ebook-tools requires libzip, which is also available from
-SlackBuilds.org.
-\ No newline at end of file
diff --git a/libraries/ebook-tools/ebook-tools.SlackBuild b/libraries/ebook-tools/ebook-tools.SlackBuild
index eeb68c7e3378a..6b238e0604741 100644
--- a/libraries/ebook-tools/ebook-tools.SlackBuild
+++ b/libraries/ebook-tools/ebook-tools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ebook-tools
 
-# Copyright 2008 Heinz Wiesinger <hmwiesinger@gmx.at>
+# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -35,10 +35,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
@@ -52,12 +55,16 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+#fix correctly installing libraries in lib$LIBDIRSUFFIX
+sed -i "s/lib /lib\${LIB_SUFFIX} /g" src/libepub/CMakeLists.txt
+
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
     ..
   make
   make install DESTDIR=$PKG
@@ -76,4 +83,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/ebook-tools/ebook-tools.info b/libraries/ebook-tools/ebook-tools.info
index dcd6f08770b84..4c781da40e34c 100644
--- a/libraries/ebook-tools/ebook-tools.info
+++ b/libraries/ebook-tools/ebook-tools.info
@@ -2,7 +2,9 @@ PRGNAM="ebook-tools"
 VERSION="0.1.1"
 HOMEPAGE="http://www.sourceforge.net/projects/ebook-tools"
 DOWNLOAD="http://downloads.sourceforge.net/ebook-tools/ebook-tools-0.1.1.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="15946af6f946eabe8247cdef9ada2b88"
-MAINTAINER="ppr:kut"
-EMAIL="HMWiesinger@gmx.at"
+MD5SUM_x86_64=""
+MAINTAINER="pprkut"
+EMAIL="pprkut@liwjatan.at"
 APPROVED="rworkman"