Upgrade

diff --git a/Install/configure.sh_TEMPLATE b/Install/configure.sh_TEMPLATE
index 9bc6a65acdf4bbefa926daeb3bb46ae9dac32baa..b17257a4e45dd4c2016071779ceed385c2605fed 100644 (file)
--- 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 f923663003766972d83572ecd6723259ce8048f8..f9734a615ce8d4acfa4b0c79a48538862ac83f3f 100644 (file)
--- 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 b89b94a3cd6b81468cb95afc093262f3c0969b0b..6f970307bdb3fb6f944f4a81e9864b6de99b5f7e 100644 (file)
--- 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