2 files changed, 16 insertions, 6 deletions
diff --git a/libraries/libtar/libtar.SlackBuild b/libraries/libtar/libtar.SlackBuild
index 6832ac252b89..dde1cfde1413 100644
--- a/libraries/libtar/libtar.SlackBuild
+++ b/libraries/libtar/libtar.SlackBuild
@@ -28,10 +28,19 @@
 
 PRGNAM=libtar
 VERSION=${VERSION:-1.2.11}
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -46,6 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -79,10 +91,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp COPYRIGHT ChangeLog-1.0.x TODO ChangeLog INSTALL README  \
diff --git a/libraries/libtar/slack-desc b/libraries/libtar/slack-desc
index 18de05f09d07..ca97e1c49298 100644
--- a/libraries/libtar/slack-desc
+++ b/libraries/libtar/slack-desc
@@ -11,7 +11,7 @@ libtar:
 libtar: libtar is a C library for manipulating POSIX tar files.
 libtar: It handles adding and extracting files to/from a tar archive.
 libtar:
-libtar: Slackbuild by David Woodfall
+libtar: Homepage: http://www.feep.net/libtar/
 libtar:
 libtar:
 libtar: