summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2010-06-06 06:18:04 -0400
committerdsomero <xgizzmo@slackbuilds.org>2010-06-07 12:49:13 -0400
commit66394ebb186f7748d0b0d8f09f2cd5321df4549f (patch)
treef7d2d5936d5014a81a33e49a1aed185a4c3164e3
parent5627dde27dc42e5c25831df4d4396b2309a1985f (diff)
downloadslackbuilds-66394ebb186f7748d0b0d8f09f2cd5321df4549f.tar.gz
system/nvidia-legacy173-kernel: Fix ordering of arch detection.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild30
1 files changed, 16 insertions, 14 deletions
diff --git a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild
index f944937265..137dfe3a60 100644
--- a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild
+++ b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild
@@ -24,25 +24,15 @@
# Thanks to Robby Workman for suggestions to improve this script.
-KERNEL=${KERNEL:-$(uname -r)}
-KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
-
-VERSION=173.14.25
PRGNAM=nvidia-legacy173-kernel
-PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
-
+VERSION=173.14.25
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-if [ "$ARCH" = "i486" ]; then
- TARGET="x86"
-elif [ "$ARCH" = "i686" ]; then
- TARGET="x86"
-elif [ "$ARCH" = "x86_64" ]; then
- TARGET="x86_64"
-fi
+KERNEL=${KERNEL:-$(uname -r)}
+KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
-SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-pkg0
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -54,6 +44,18 @@ if [ -z "$ARCH" ]; then
esac
fi
+if [ "$ARCH" = "i486" ]; then
+ TARGET="x86"
+elif [ "$ARCH" = "i686" ]; then
+ TARGET="x86"
+elif [ "$ARCH" = "x86_64" ]; then
+ TARGET="x86_64"
+fi
+
+unset ARCH
+
+SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-pkg0
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=${PKG:-$TMP/package-$PRGNAM}