Changeset 21443 for gs2-extensions

Timestamp:

2010-01-11T23:24:18+13:00 (14 years ago)

Author:

davidb

Message:

More careful check for when force configure is needed

File:

• gs2-extensions/gsdl-video/trunk/cascade-make/lib/cascade-lib.bash (modified) (2 diffs)

gs2-extensions/gsdl-video/trunk/cascade-make/lib/cascade-lib.bash

@@ -161 +161 @@
 distclean=0
 tarclean=0
-installclean=0
 
 if [ $# -gt 0 ] ; then
   for cmd in $* ; do
     echo $cmd
-    if   [ $cmd = "untar" ] ;        then force_untar=1
-    elif [ $cmd = "configure" ] ;    then force_config=1
-    elif [ $cmd = "compile" ]   ;    then compile=1
-    elif [ $cmd = "install" ]   ;    then install=1  
-    elif [ $cmd = "clean" ]     ;    then clean=1  
-    elif [ $cmd = "distclean" ] ;    then distclean=1
-    elif [ $cmd = "tarclean" ] ;     then tarclean=1
-    elif [ $cmd = "installclean" ] ; then installclean=1
+    if   [ $cmd = "untar" ] ;     then force_untar=1
+    elif [ $cmd = "configure" ] ; then force_config=1
+    elif [ $cmd = "compile" ]   ; then compile=1
+    elif [ $cmd = "install" ]   ; then install=1  
+    elif [ $cmd = "clean" ]     ; then clean=1  
+    elif [ $cmd = "distclean" ] ; then distclean=1
+    elif [ $cmd = "tarclean" ] ;  then tarclean=1
     fi
   done
@@ -185 +183 @@
   distclean=0
   tarclean=0
-  installclean=0
 fi
 
 if [ $auto_config = "1" ] ; then
-  if [ ! -e $package$version/Makefile ] ; then
+  if [ ! -e $package$version/Makefile ] &&  [ ! -e $package$version/config.h ] ; then
     force_config=1
   fi
+
 fi