aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:17 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:17 -0400
commite01a43cd2b4e2f06e00f5f76b741c20b58ea937b (patch)
treeb20858696987bbe30497ae85fb4c97a04fc5bac0
parent16f3aba2748c4d91ccd86dc4e68a52601e04e7de (diff)
desktop/nitrogen: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/nitrogen/nitrogen.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/nitrogen/nitrogen.SlackBuild b/desktop/nitrogen/nitrogen.SlackBuild
index b2021e9ec24c4..978c977b3c585 100644
--- a/desktop/nitrogen/nitrogen.SlackBuild
+++ b/desktop/nitrogen/nitrogen.SlackBuild
@@ -7,12 +7,21 @@
PRGNAM=nitrogen
VERSION=1.4
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README"
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -27,6 +36,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e