From: eduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Date: Thu, 19 Oct 2023 13:26:51 +0000 (+0200)
Subject: #3455 bug Mac Install
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e00550a6403cd065c94837664cef59c6f9b6af40;p=creaToolsTools.git

#3455 bug Mac Install
---

diff --git a/Linux/scripts/installmod.sh b/Linux/scripts/installmod.sh
index d2f8630..83f580a 100644
--- a/Linux/scripts/installmod.sh
+++ b/Linux/scripts/installmod.sh
@@ -40,37 +40,29 @@ cd $3/creatools_bin/$2Bin
 installPrefix=$4
 # We install, now
 
-pwd
 make -j $5 install
 make install
 
 if [ -e $installPrefix/lib64 ]
 then
-   # grouik style patch JPR
-   if [ $2 = "bbtk" ]
-   then
-      echo "export BBTK_DIR=""$""installPrefix/lib64/creatools/$2"   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
-   else
-      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
-
+    libTmpName=lib64
 else
    if [ -e $installPrefix/lib ]
    then
-      # grouik style patch JPR
-      if [ $2 = "bbtk" ]
-      then
-         echo "export BBTK_DIR=""$""installPrefix/lib/creatools/$2"   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
-      else
-         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
+        libTmpName=lib
    else
       echo "============================= NEITHER $installPrefix/lib64 NOR $installPrefix/lib EXIST ?!?"
    fi
+fi
 
+# grouik style patch JPR
+if [ $2 = "bbtk" ]
+then
+    echo "export BBTK_DIR=""$""installPrefix/$libTmpName/creatools/$2"   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+else
+    echo "export $2_DIR=""$""installPrefix/$libTmpName/creatools/$2"     >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+    echo "export bb$2_DIR=""$""installPrefix/$libTmpName/creatools/bb$2" >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh      
 fi
+
 cd ../..
-pwd
 
diff --git a/Linux/scripts/installmodNomake.sh b/Linux/scripts/installmodNomake.sh
index 631e7f7..0d0f46d 100644
--- a/Linux/scripts/installmodNomake.sh
+++ b/Linux/scripts/installmodNomake.sh
@@ -45,35 +45,22 @@ echo $4
 installPrefix=$4
 # We install, now
 
-pwd
 #make install
 
 if [ -e $installPrefix/lib64 ]
 then
-   # grouik style patch JPR
-   #if [ $2 = "bbtk" ]
-   #then
-   #   echo export BBTK_DIR=$installPrefix/lib64/creatools/$2   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
-   #else
-      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
-fi
-
-if [ -e $installPrefix/lib ]
-then
-   # grouik style patch JPR
-#   if [ $2 = "bbtk" ]
-#   then
-#      echo "export BBTK_DIR=$installPrefix/lib/creatools/$2"   >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
-#   else
-      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
-   
+    libTmpName=lib64
 else
-   echo "============================= NEITHER $installPrefix/lib64 NOR installPrefix/lib EXIST ?!?"
+    if [ -e $installPrefix/lib ]
+    then
+        libTmpName=lib
+    else
+    echo "============================= NEITHER $installPrefix/lib64 NOR installPrefix/lib EXIST ?!?"
+    fi
 fi
+
+echo "export $2_DIR=""$""installPrefix/$libTmpName/creatools/$2"     >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+echo "export bb$2_DIR=""$""installPrefix/$libTmpName/creatools/bb$2" >> $baseLibraryCreatoolsDir/creatools_base_library_config.sh      
+
 cd ../..
-pwd