From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Tue, 21 Jun 2011 15:12:39 +0000 (+0000)
Subject: last patch for creatools installation on MacOSX
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5a79b5a7d0eb2c5d4298ab14934280d14f85f712;p=creaToolsTools.git

last patch for creatools installation on MacOSX
---

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index af8d8b4..0904608 100644
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -118,9 +118,10 @@ fi
  creadll=$generationdir/creatools_bin/creaBin
  if [ $OperatingSystem = "MacOS" ]
  then
-    DYLD_LIBRARY_PATH=$creadll:DYLD_LIBRARY_$PATH 
+  #duplicate form creaTools_name.sh?? //FCY
+    DYLD_LIBRARY_PATH=$creadll:$DYLD_LIBRARY_$PATH 
  else
-    LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
+    LD_LIBRARY_PATH=$creadll:$LD_LIBRARY_$PATH
  fi
  export crea_DIR=$generationdir/creatools_bin/creaBin
 
@@ -145,6 +146,7 @@ fi
 bbtkdll=$generationdir/creatools_bin/bbtkBin
 if [ $OperatingSystem = "MacOS" ]
 then
+#duplicate form creaTools_name.sh?? //FCY
     DYLD_LIBRARY_PATH=$bbtkdll:$DYLD_LIBRARY_PATH
 else
     LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
@@ -171,9 +173,10 @@ fi
 
 if [ $OperatingSystem = "MacOS" ]
 then
-    DYLD_LIBRARY_PATH=$creamaracasdll:DYLD_LIBRARY_$PATH 
+#duplicate form creaTools_name.sh?? //FCY
+    DYLD_LIBRARY_PATH=$creamaracasdll:$DYLD_LIBRARY_$PATH 
 else
-    LD_LIBRARY_PATH=$creamaracasdll:LD_LIBRARY_$PATH
+    LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_$PATH
 fi 
  
  export creaMaracasVisu_DIR=$generationdir/creatools_bin/creaMaracasVisuBin
@@ -198,9 +201,10 @@ fi
  
 if [ $OperatingSystem = "MacOS" ]
 then
-    DYLD_LIBRARY_PATH=$creaenvironmentdll:DYLD_LIBRARY_$PATH 
+#duplicate form creaTools_name.sh?? //FCY
+    DYLD_LIBRARY_PATH=$creaenvironmentdll:$DYLD_LIBRARY_$PATH 
 else
-    LD_LIBRARY_PATH=$creaenvironmentdll:LD_LIBRARY_$PATH
+    LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_$PATH
 fi
 
  export creaEnvironment_DIR=$generationdir/creatools_bin/creaEnvironmentBin
@@ -225,9 +229,10 @@ fi
  
 if [ $OperatingSystem = "MacOS" ]
 then
-    DYLD_LIBRARY_PATH=$creabrukerdll:DYLD_LIBRARY_$PATH 
+#duplicate form creaTools_name.sh?? //FCY
+    DYLD_LIBRARY_PATH=$creabrukerdll:$DYLD_LIBRARY_$PATH 
 else
-    LD_LIBRARY_PATH=$creabrukerdll:LD_LIBRARY_$PATH
+    LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_$PATH
 fi 
  
  export creaBruker_DIR=$generationdir/creatools_bin/creaBrukerBin
@@ -252,9 +257,10 @@ fi
  
 if [ $OperatingSystem = "MacOS" ]
 then
-    DYLD_LIBRARY_PATH=$creaimagedll:DYLD_LIBRARY_$PATH 
+#duplicate form creaTools_name.sh?? //FCY
+    DYLD_LIBRARY_PATH=$creaimagedll:$DYLD_LIBRARY_$PATH 
 else
-    LD_LIBRARY_PATH=$creaimagedll:LD_LIBRARY_$PATH
+    LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_$PATH
 fi
 
 export creaImageIO_DIR=$generationdir/creatools_bin/creaImageIOBin
@@ -279,9 +285,10 @@ fi
  
 if [ $OperatingSystem = "MacOS" ]
 then
-    DYLD_LIBRARY_PATH=$creacontoursdll:DYLD_LIBRARY_$PATH 
+#duplicate form creaTools_name.sh?? //FCY
+    DYLD_LIBRARY_PATH=$creacontoursdll:$DYLD_LIBRARY_$PATH 
 else
-    LD_LIBRARY_PATH=$creacontoursdll:LD_LIBRARY_$PATH
+    LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_$PATH
 fi
 
  export creaContours_DIR=$generationdir/creatools_bin/creaContoursBin
diff --git a/Linux/scripts/CreaTools-names.sh b/Linux/scripts/CreaTools-names.sh
index 8254db0..0b36f19 100644
--- a/Linux/scripts/CreaTools-names.sh
+++ b/Linux/scripts/CreaTools-names.sh
@@ -34,7 +34,7 @@ echo "++++++++++++++++++++++++++++++++++++++++++++++++OperatingSystem " $Operati
 if [ $OperatingSystem = "MacOS" ]
 then
   creadll=$generationdir/creatools_bin/creaBin
-DYLD_LIBRARY_PATH=$creadll:DYLD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=$creadll:$DYLD_LIBRARY_PATH
   bbtkdll=$generationdir/creatools_bin/bbtkBin
 DYLD_LIBRARY_PATH=$bbtkdll:$DYLD_LIBRARY_PATH
   creamaracasdll=$generationdir/creatools_bin/creamaracasBin
@@ -59,7 +59,7 @@ DYLD_LIBRARY_PATH=$creaminitoolssdll:$DYLD_LIBRARY_PATH
 #DYLD_LIBRARY_PATH=$libidodll:$DYLD_LIBRARY_PATH
 else
   creadll=$generationdir/creatools_bin/creaBin
-LD_LIBRARY_PATH=$creadll:LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$creadll:$LD_LIBRARY_PATH
   bbtkdll=$generationdir/creatools_bin/bbtkBin
 LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
   creamaracasdll=$generationdir/creatools_bin/creamaracasBin