From 37d5066bf3718086cd37feec7c68d65cb5496916 Mon Sep 17 00:00:00 2001
From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Wed, 15 Jun 2011 16:31:50 +0000
Subject: [PATCH] fix generation dir

---
 Linux/menu.sh                           | 18 ++++++++++--------
 Linux/scripts/ThirdParty-install-VTK.sh |  4 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Linux/menu.sh b/Linux/menu.sh
index f3da997..78252d5 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -21,11 +21,11 @@ do
 
    if [ $expanded = "YES" ]
    then 
-      echo " install all base stuff  :..    ....1.0"
+      echo " Install all base stuff  :..........1.0"
       echo "        (cmake, doxygen, graphviz, ...)"
-      echo " Get and Compile  vtk :..    .......1.1"                
-      echo " Get and Compile  gdcm :..    ......1.2" 
-      echo " Get and Compile  itk :..    .......1.3"
+      echo " Get, Compile, Install vtk   .......1.1"                
+      echo " Get, Compile, Install gdcm :.. .  .1.2" 
+      echo " Get, Compile, Install itk  :.......1.3"
 
    else
       echo " Install Third Party Libraries :....1 (as root)"   
@@ -154,14 +154,16 @@ do
         echo "you said : [" $corenumber "]"
 
         echo
-        echo	
-
+        echo
+		
+        racine=$HOME/myDefaultCreatoolsGenerationDir
         # ------------------
-        echo "Name of the Generation Directory (default is ~/myDefaultGenerationDir)"
+        echo "Name of the Generation Directory (default is $racine)"
         read generationdir
         if [ "$generationdir" = "" ]
         then
-           generationdir="~/myDefaultGenerationDir"
+	   
+           generationdir=$racine
         fi
         echo "you said : [" $generationdir "]"
 
diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 985474d..f2a0b21 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -72,12 +72,14 @@ fi
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
-then
+then  
+
   libname=VTK
   dirInstall=$binDir/$libname-Bin
   dirInstallVTK=$dirInstall
   export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
   mkdir $dirInstall
+  echo "we prepare directories dirInstallVTK " $dirInstallVTK  " VTK_DIR " $installPrefixThird/lib/vtk-5.6/
   cd $dirInstall
  
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
-- 
2.45.1