From eb7c90aa312001425060c0f55b546dd63b69ad05 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Mon, 24 May 2010 10:45:39 -0500
Subject: libraries/ORBit2: Miscellaneous cleanups.

---
 libraries/ORBit2/ORBit2.SlackBuild | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'libraries/ORBit2')

diff --git a/libraries/ORBit2/ORBit2.SlackBuild b/libraries/ORBit2/ORBit2.SlackBuild
index 2c2bf9a6ef..fa3b1f2153 100644
--- a/libraries/ORBit2/ORBit2.SlackBuild
+++ b/libraries/ORBit2/ORBit2.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=ORBit2
 VERSION=${VERSION:-2.14.17}
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -73,12 +85,11 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README* \
-  TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README* TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
-  ln -s /usr/share/gtk-doc/html/ORBit2 html
-)
+( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s /usr/share/gtk-doc/html/ORBit2 html )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-- 
cgit v1.2.3-65-gdbad