Fix new way

diff --git a/Install/scripts/installmod.sh b/Install/scripts/installmod.sh
index 7ad8a81d7305f3e5a34e985b288ef29b8cba6638..cdb0576d25536eb3870f9c12cd140339231e1668 100644 (file)
--- a/Install/scripts/installmod.sh
+++ b/Install/scripts/installmod.sh
@@ -3,7 +3,10 @@
 # $3 : generationdir ex : /tmp/myGenerationDir
 
 cd $3/creatools_bin/$2Bin
-echo "--------------------------------------in compilemod-- $2 ------------"
+echo
+echo
+echo
+echo "------------------------------------------in installmod-- $2 ------------"
 echo $1
 echo $2
 echo $3
@@ -18,4 +21,3 @@ sudo make install
 cd ../..
 pwd
 
-echo "--------------------------------------out compilemod--------------"

diff --git a/Install/scripts/make-install.sh b/Install/scripts/make-install.sh
index 13d043bb5fade1a82d7e0dda6d46d0d58e9bbdf3..475cebd0af8c358b2c596fe51919886367322655 100644 (file)
--- a/Install/scripts/make-install.sh
+++ b/Install/scripts/make-install.sh
@@ -16,16 +16,18 @@ source $PWD/configure.sh
 
 cd $scriptDir
 
- sh installmod.sh      $buildType $creasource                   $generationdir  
- sh installmod.sh      $buildType $bbtksource                   $generationdir
- sh installmod.sh       $buildType $creamaracassource            $generationdir  
- sh installmod.sh       $buildType $creaenvironmentsource        $generationdir
- sh installmod.sh       $buildType $creabrukersource             $generationdir
- sh installmod.sh      $buildType $creaimagesource              $generationdir
- sh installmod.sh      $buildType $creacontourssource           $generationdir
- sh installmod.sh      $buildType $crearigidregistrationssource $generationdir
- sh installmod.sh      $buildType $bbtkgeditorsource            $generationdir
- sh installmod.sh      $buildType $creatoolssource              $generationdir 
+ sh installmod.sh $buildType $creasource                   $generationdir  
+ sh installmod.sh $buildType $bbtksource                   $generationdir
+ sh installmod.sh $buildType $creamaracassource            $generationdir  
+ sh installmod.sh $buildType $creaenvironmentsource        $generationdir
+ sh installmod.sh $buildType $creabrukersource             $generationdir
+ sh installmod.sh $buildType $creaimagesource              $generationdir
+ sh installmod.sh $buildType $creacontourssource           $generationdir
+ sh installmod.sh $buildType $crearigidregistrationssource $generationdir
+ sh installmod.sh $buildType $bbtkgeditorsource            $generationdir
+ sh installmod.sh $buildType $creatoolssource              $generationdir 
+
+exit 0
 
 
 CREATOOLS_INSTALL_DIR=$installPrefix

diff --git a/Install/scripts/make.sh b/Install/scripts/make.sh
index 95e0b60d0e4b5c9ec55f7f23e87613ba9ba963e8..1f2214a46aeae81f0144c24490d02c8e80040149 100644 (file)
--- a/Install/scripts/make.sh
+++ b/Install/scripts/make.sh
@@ -219,7 +219,7 @@ then
 # creaImageIO
  sh $scriptDir/cmakemod.sh              $creaimagesource $generationdir $installPrefix $buildType 
  sh $scriptDir/creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh    $buildType $creaimagesource $generationdir
+ sh $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir
  sh $scriptDir/ctestmod.sh              $creaimagesource $generationdir
 fi
 fi
@@ -239,7 +239,7 @@ then
 # creaContours
  sh $scriptDir/cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
  sh $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh    $buildType $creacontourssource $generationdir
+ sh $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir
  sh $scriptDir/ctestmod.sh              $creacontourssource $generationdir
 fi
 fi