From 9cd6dd13d771802c93e988bdc1bf53aad97c665a Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@slackbuilds.org>
Date: Sun, 6 Jun 2010 06:20:02 -0400
Subject: system/nvidia-legacy96-kernel: Fix ordering of arch detection.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 .../nvidia-legacy96-kernel.SlackBuild              | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'system/nvidia-legacy96-kernel')

diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild
index 2fe27f86d698..b080bfe4f9e1 100644
--- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild
+++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-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=96.43.16
 PRGNAM=nvidia-legacy96-kernel
-PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
-
+VERSION=96.43.16
 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}
-- 
cgit v1.2.3