1 files changed, 11 insertions, 6 deletions
diff --git a/libraries/hdf5/hdf5.SlackBuild b/libraries/hdf5/hdf5.SlackBuild
index 651ef23cbf5f2..0a2dc6314dfc5 100644
--- a/libraries/hdf5/hdf5.SlackBuild
+++ b/libraries/hdf5/hdf5.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for hdf5
 
-# Copyright 2007  LukenShiro <lukenshiro@ngi.it>
+# Copyright 2007-2009  LukenShiro <lukenshiro@ngi.it>
 # 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=hdf5
-VERSION=1.8.1
+VERSION=${VERSION:-1.8.3}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,19 +35,25 @@ 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
 
+DOCFILES="COPYING MANIFEST README.txt release_docs/RELEASE.txt \
+  release_docs/HISTORY-1_8.txt"
+
 set -e # Exit on most errors
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -57,6 +63,7 @@ CPPFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-pthread \
   --enable-cxx \
@@ -71,10 +78,8 @@ make
 make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING MANIFEST README.txt release_docs/RELEASE.txt \
-  release_docs/HISTORY-1_8.txt $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 0644 $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 # Remove unnecessary stuff
 rm -f $PKG/usr/lib/*.settings