X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2Finstallmod.sh;h=a1db560884b6cc26ecaa7491663db8396c6d22c2;hb=1195cf5621f8d7a36af22f32633d443e8d29221d;hp=447316a45a9e51745b7827837d1993b1c285a5bb;hpb=5ceecf6dda6a78fc6cefb8e9f8774f2a287a3729;p=creaToolsTools.git

diff --git a/Linux/scripts/installmod.sh b/Linux/scripts/installmod.sh
index 447316a..a1db560 100644
--- a/Linux/scripts/installmod.sh
+++ b/Linux/scripts/installmod.sh
@@ -1,3 +1,27 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
 # $1 : useless for Linux (Release/Debug)
 # $2 : name of source ex : crea
 # $3 : generationdir ex :  ~/myDefaultGenerationDir
@@ -17,6 +41,7 @@ installPrefix=$4
 # We install, now
 
 pwd
+make -j $5 install
 make install
 
 if [ -e $installPrefix/lib64 ]
@@ -24,10 +49,10 @@ then
    # grouik style patch JPR
    if [ $2 = "bbtk" ]
    then
-      echo export BBTK_DIR=$installPrefix/lib64/creatools/$2   >> $installPrefix/share/creatools_base_library_config.sh
+      echo export BBTK_DIR='$'installPrefix/lib64/creatools/$2   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
    else
-      echo export $2_DIR=$installPrefix/lib64/creatools/$2     >> $installPrefix/share/creatools_base_library_config.sh
-      echo export bb$2_DIR=$installPrefix/lib64/creatools/bb$2 >> $installPrefix/share/creatools_base_library_config.sh      
+      echo export $2_DIR='$'installPrefix/lib64/creatools/$2     >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+      echo export bb$2_DIR='$'installPrefix/lib64/creatools/bb$2 >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh      
    fi
 
 else
@@ -36,10 +61,10 @@ else
       # grouik style patch JPR
       if [ $2 = "bbtk" ]
       then
-         echo "export BBTK_DIR=$installPrefix/lib/creatools/$2"   >> $installPrefix/share/creatools_base_library_config.sh
+         echo "export BBTK_DIR='$'installPrefix/lib/creatools/$2"   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
       else
-         echo "export $2_DIR=$installPrefix/lib/creatools/$2"     >> $installPrefix/share/creatools_base_library_config.sh
-         echo "export bb$2_DIR=$installPrefix/lib/creatools/bb$2" >> $installPrefix/share/creatools_base_library_config.sh    
+         echo "export $2_DIR='$'installPrefix/lib/creatools/$2"     >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+         echo "export bb$2_DIR='$'installPrefix/lib/creatools/bb$2" >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh    
       fi
    else
       echo "============================= NEITHER $installPrefix/lib64 NOR $installPrefix/lib EXIST ?!?"