#3405 vtk8itk5wx3-macos

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index 0f4a589967e75a6546cc9b9d2485d751d4db87e6..263c4312e6afb8b7a9f978b2e3d632058dcacc20 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -143,11 +143,12 @@
         cp /opt/local/lib/libicudata.67.dylib      .
         cp /opt/local/lib/libicui18n.67.dylib     .
         cp /opt/local/lib/libicuuc.67.dylib       .
-        
-        cp /opt/local/lib/libiconv.2.dylib            .
+
+               mkdir opt
+        cp /opt/local/lib/libiconv.2.dylib            opt/.
         cp /opt/local/lib/liblzo2.2.dylib             .
         cp /opt/local/lib/liblz4.1.dylib              .
-        cp /opt/local/lib/libarchive.dylib            .
+#        cp /opt/local/lib/libarchive.dylib           .
  #       cp /opt/local/lib/liblzma.5.dylib            .
   #      cp /opt/local/lib/libcharset.1.dylib     .
  #       cp /opt/local/lib/libbz2.1.0.dylib           .
@@ -208,14 +209,14 @@
          echo "  ln -s libwx_osx_cocoau_core-3.0.0.5.0.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
          echo "  ln -s libwx_osx_cocoau_gl-3.0.0.5.0.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
          echo "  ln -s libwx_osx_cocoau_html-3.0.0.5.0.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
-         echo " ln -s libarchive.dylib libarchive.2.dylib" >>  $filename_BinVersion
+#        echo " ln -s libarchive.dylib libarchive.2.dylib" >>  $filename_BinVersion
          echo "ACTUALDIRLINK=\$(pwd)" >>  $filename_BinVersion
-         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/libiconv.2.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
-         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/libiconv.2.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
-         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/libiconv.2.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
-         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/libiconv.2.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
-         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/libiconv.2.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
-         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/libiconv.2.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
+         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
+         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
+         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
+         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
+         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
+         echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
          echo "  cd ../.." >>  $filename_BinVersion
          
       echo "   installPrefixTPLaux=\$(pwd)/creatoolsTPLaux #You need this variable in the -barshrc script" >>  $filename_BinVersion