From 250ff7ba44d01aff4f184ddb04ab6be34dc459fb Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Fri, 21 May 2010 13:15:29 -0500
Subject: libraries/libgsasl: Miscellaneous cleanups.

---
 libraries/libgsasl/libgsasl.SlackBuild | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'libraries/libgsasl/libgsasl.SlackBuild')

diff --git a/libraries/libgsasl/libgsasl.SlackBuild b/libraries/libgsasl/libgsasl.SlackBuild
index e1ee890ab518..992350dcceb3 100644
--- a/libraries/libgsasl/libgsasl.SlackBuild
+++ b/libraries/libgsasl/libgsasl.SlackBuild
@@ -26,10 +26,19 @@
 
 PRGNAM=libgsasl
 VERSION=1.4.0
-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
@@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -75,7 +87,7 @@ make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README THANKS \
+  AUTHORS COPYING* ChangeLog INSTALL NEWS README THANKS \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-- 
cgit v1.2.3