From cbf818ee799331b8f39c3ec256ec6a13c733ad3a Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Thu, 20 May 2010 15:01:31 -0500
Subject: libraries/gtkglext: Miscellaneous cleanups.

---
 libraries/gtkglext/gtkglext.SlackBuild | 16 ++++++++++++++--
 libraries/gtkglext/slack-desc          |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'libraries')

diff --git a/libraries/gtkglext/gtkglext.SlackBuild b/libraries/gtkglext/gtkglext.SlackBuild
index e4e64f72c1..6f72e83251 100644
--- a/libraries/gtkglext/gtkglext.SlackBuild
+++ b/libraries/gtkglext/gtkglext.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gtkglext
 
-# Copyright 2007,2008 Robby Workman  Northport, Alabama (USA)
+# Copyright 2007,2008,2010  Robby Workman, Northport, Alabama (USA)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
 
 PRGNAM=gtkglext
 VERSION=1.2.0
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-2}
 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
diff --git a/libraries/gtkglext/slack-desc b/libraries/gtkglext/slack-desc
index e419245f63..c7bf8b7a55 100644
--- a/libraries/gtkglext/slack-desc
+++ b/libraries/gtkglext/slack-desc
@@ -7,7 +7,7 @@
 
         |-----handy-ruler------------------------------------------------------|
 gtkglext: GtkGLExt (an OpenGL extension to GTK)
-gtkglext: 
+gtkglext:
 gtkglext: This package is composed of GdkGLExt library and GtkGLExt library.
 gtkglext: GdkGLExt library provides the GDK objects which support OpenGL
 gtkglext: rendering in GTK. GtkGLExt library provides the GtkWidget API 
-- 
cgit v1.2.3