From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Thu, 25 Nov 2010 15:49:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: Creatools2-0-3.creaToolsTools2-0-3.17Feb2011~85
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cc0d6d43942b6fbe317f07aa1b61b63199bcd75d;p=creaToolsTools.git

*** empty log message ***
---

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.sh b/Install_ThirdParty/scripts/install_thirdparty_all.sh
index 63813e9..e4e3364 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.sh
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.sh
@@ -44,7 +44,7 @@ OS=$4
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
-THIRDPARTY_INSTALL_DIR=$installPrefix/thirdparty_install
+
 
 mkdir $generationdir
 mkdir $sourcesDir
@@ -195,23 +195,23 @@ fi
 
 #deal with create creatools_third_party_libraries_config.sh
 
-sudo touch     $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo chmod 666 $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
+sudo touch     $installPrefix/share/creatools_third_party_library_config.sh
+sudo chmod 666 $installPrefix/share/creatools_third_party_library_config.sh
 
-sudo echo export PATH='$'PATH:$THIRDPARTY_INSTALL_DIR/bin             >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export VTK_DIR=$THIRDPARTY_INSTALL_DIR/lib/vtk-5.6          >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export ITK_DIR=$THIRDPARTY_INSTALL_DIR/lib/InsightToolkit   >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export GDCM_DIR=$THIRDPARTY_INSTALL_DIR/lib/gdcm            >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR         >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR          >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR          >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
+sudo echo export PATH='$'PATH:$THIRDPARTY_INSTALL_DIR/bin             >> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export VTK_DIR=$THIRDPARTY_INSTALL_DIR/lib/vtk-5.6          >> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export ITK_DIR=$THIRDPARTY_INSTALL_DIR/lib/InsightToolkit   >> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export GDCM_DIR=$THIRDPARTY_INSTALL_DIR/lib/gdcm            >> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR         >> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR          >> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR          >> $installPrefix/share/creatools_third_party_library_config.sh
 
 #  modify .bashrc
-# - remove line 'sh $installPrefix/thirdparty_install/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
+# - remove line 'sh $installPrefix/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
 sed -i -e '/.*creatools_third_party_library_config.*/ d' ~/.bashrc
 
-# - add line 'sh $installPrefix/thirdparty_install/share/creatools_third_party_library_config.sh' (with accurate value for ???)
-echo source $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh >> ~/.bashrc 
+# - add line 'sh $installPrefix/share/creatools_third_party_library_config.sh' (with accurate value for ???)
+echo source $installPrefix/share/creatools_third_party_library_config.sh >> ~/.bashrc