[Lunar-commits] <moonbase> gtk+-2: a better version to deal with NVIDIA based modules.

[Florin Braescu]

commit f77ca90fe3c3d953b8f474bee7e0dc02998168fd
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sat Nov 12 15:21:06 2011 +0100

    gtk+-2: a better version to deal with NVIDIA based modules.
---
 graphics/gtk+-2/BUILD |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index a98970f..a532f74 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -24,27 +24,22 @@
   OPTS+=" --with-gdktarget=x11"
 
 # remove the existing NVIDIA or NVIDIA-beta module to prevent the compiling failing
-  WITH_NV="n"   &&
-  WITH_NVB="n"  &&
+  WITH_NV=0  &&
   if module_installed NVIDIA; then
-      WITH_NV="y"  &&
+      WITH_NV=1  &&
       lrm NVIDIA
-    else
-      if module_installed NVIDIA-beta; then
-        WITH_NVB="y"  &&
-        lrm NVIDIA-beta
-      fi
+    elsif module_installed NVIDIA-beta; then
+      WITH_NV=2  &&
+      lrm NVIDIA-beta
   fi  &&
 
   default_build  &&
 
 # restore the NVIDIA or NVIDIA-beta module, if it was previously installed
-  if [ $WITH_NV = "y" ]; then
+  if [ $WITH_NV = 1 ]; then
       lin NVIDIA
-    else
-      if [ $WITH_NVB = "y" ]; then
-        lin NVIDIA-beta
-      fi
+    elsif [ $WITH_NV = 2 ]; then
+      lin NVIDIA-beta
   fi
 
 ) > $C_FIFO 2>&1