Old uncommited patches

diff --git a/Linux/menu.sh b/Linux/menu.sh
index fba2b716483def2a04f6f55dac24636e889669df..a8a50ac8bc113c57f293239bf06dd6a5da413452 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -522,7 +522,7 @@ do
         echo "ITK_DIR  : " $ITK_DIR
         echo "GDCM_DIR : " $GDCM_DIR
         echo "crea_DIR :                 " $crea_DIR
-        echo "bbtk_DIR :                 " $bbtk_DIR
+        echo "BBTK_DIR :                 " $BBTK_DIR
         echo "creaMaracasVisu_DIR :      " $creaMaracasVisu_DIR
         echo "creaEnvironment_DIR :      " $creaEnvironment_DIR
         echo "creaBruker_DIR :           " $creaBruker_DIR

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 1a4bbf0027563c6ee422cc2d3051c489f907ffea..03cd8c675d0d874ba7b9b78feea4e0c53df8789b 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -136,7 +136,7 @@ fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
  LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
- export bbtk_DIR=$generationdir/creatools_bin/bbtkBin
+ export BBTK_DIR=$generationdir/creatools_bin/bbtkBin
 
 # -------------------------
 #        start_point =  4 : creaMaracasVisu

diff --git a/Linux/scripts/installmod.sh b/Linux/scripts/installmod.sh
index 9646409ee02e9f50783ebaeba363a94d7d7bb740..1fa7415c9aec4c8ad1012843b10a7a1ba51c6f2e 100644 (file)
--- a/Linux/scripts/installmod.sh
+++ b/Linux/scripts/installmod.sh
@@ -19,11 +19,24 @@ make install
 
 if [ -e $installPrefix/lib64 ]
 then
-   echo export $2_DIR=$installPrefix/lib64/creatools/$2 >> $installPrefix/share/creatools_base_library_config.sh
+   # grouik style patch JPR
+   if [ $2 = "bbtk" ]
+   then
+      echo export BBTK_DIR=$installPrefix/lib64/creatools/$2 >> $installPrefix/share/creatools_base_library_config.sh
+   else
+      echo export $2_DIR=$installPrefix/lib64/creatools/$2 >> $installPrefix/share/creatools_base_library_config.sh
+   fi
 fi
 if [ -e $installPrefix/lib ]
 then
-   echo "export $2_DIR=$installPrefix/lib/creatools/$2"   >> $installPrefix/share/creatools_base_library_config.sh
+   # grouik style patch JPR
+   if [ $2 = "bbtk" ]
+   then
+      echo "export BBTK_DIR=$installPrefix/lib/creatools/$2"   >> $installPrefix/share/creatools_base_library_config.sh
+   else
+      echo "export $2_DIR=$installPrefix/lib/creatools/$2"   >> $installPrefix/share/creatools_base_library_config.sh    
+   fi
+   
 else
    echo "============================= NEITHER $installPrefix/lib64 NOR installPrefix/lib EXIST ?!?"
 fi