From d7e886dff3306c0cad4b742ff0d8666008a65bce Mon Sep 17 00:00:00 2001
From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Thu, 6 Jan 2011 11:38:44 +0000
Subject: [PATCH] Upgrade

---
 Install/configure.sh_TEMPLATE   |  1 -
 Install/scripts/installmod.sh   |  3 ---
 Install/scripts/make-install.sh | 12 ++++++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Install/configure.sh_TEMPLATE b/Install/configure.sh_TEMPLATE
index 9bc6a65..b17257a 100644
--- a/Install/configure.sh_TEMPLATE
+++ b/Install/configure.sh_TEMPLATE
@@ -29,7 +29,6 @@ sourcesFrom=<where do you want to get them from> : CVS / HTML
 
 start_point=0
 
-installPrefix=$generationdir/creatools_install
 scriptDir=$PWD/scripts
 
  creasource=crea
diff --git a/Install/scripts/installmod.sh b/Install/scripts/installmod.sh
index f923663..f9734a6 100644
--- a/Install/scripts/installmod.sh
+++ b/Install/scripts/installmod.sh
@@ -11,9 +11,6 @@ echo $1
 echo $2
 echo $3
 
-# make already performed in compilemod.sh
-#make -j 2
-
 # We install, now
 
 pwd
diff --git a/Install/scripts/make-install.sh b/Install/scripts/make-install.sh
index b89b94a..6f97030 100644
--- a/Install/scripts/make-install.sh
+++ b/Install/scripts/make-install.sh
@@ -16,17 +16,21 @@ then
   sh installmod.sh $buildType $crearigidregistrationssource $generationdir
   sh installmod.sh $buildType $bbtkgeditorsource            $generationdir
   sh installmod.sh $buildType $creatoolssource              $generationdir
+  
   touch     $installPrefix/share/creatools_base_library_config.sh
   rm        $installPrefix/share/creatools_base_library_config.sh
   touch     $installPrefix/share/creatools_base_library_config.sh
   chmod 755 $installPrefix/share/creatools_base_library_config.sh
+  
   echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
-  #  modify .bashrc
-  # - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)
-  sed -i -e '/.*creatools_base_library_config.*/ d' /etc/bashrc 
-  # - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' (with accurate value for ???)
+  
+
+  # - remove line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' if any
+  sed -i -e '/.*creatools_base_library_config.*/ d' /etc/bashrc
+  #  modify /etc/bashrc (we cannot modify .bashrc, since we witched as root)  
+  # - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh'
   echo source $installPrefix/share/creatools_base_library_config.sh >> /etc/bashrc
 else
   echo
-- 
2.45.1