Minor fixes for MAC OS

INSTALL.mac

@@ -13,6 +13,13 @@ to build XCA, not the comlete 2GB Xcode binary.
 Either Install QT SDK in your home directory, say /Users/XXX/QtSDK
 or install the qt-mac-carbon-opensource-4.7.3.dmg
 
+For later versions of QT which don't come as 32/64 bit bundles, i compiled
+QT (4.8.5) with the following command:
+
+ ./configure -no-qt3support -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-svg -no-webkit -no-javascript-jit -no-script -no-scripttools -no-declarative -arch x86 -opensource -release -prefix $HOME/src/install/Qt485
+
+You should then "export QTDIR=$HOME/src/install/Qt485"
+
 Decide whether OpenSSL 1.0.x shall be used.
 It is needed if
 
@@ -20,7 +27,7 @@ It is needed if
  - you don't have at least SnowLeopard
    (Mac OS 10.5 comes with OpenSSL 0.9.7, which is too old for XCA)
 
-Compile OpenSSL 1.0.1e:
+Compile OpenSSL 1.0.1g:
 ----------------------
 # Download the latest OpenSSL sources, unpack them and change into it
 curl http://www.openssl.org/source/openssl-1.0.1g.tar.gz >openssl-1.0.1g.tar.gz

misc/build-mac.sh

@@ -3,33 +3,47 @@
 do_openssl()
 {
 openssl="openssl-1.0.1g"
-test -f "$openssl".tar.gz || curl http://openssl.org/source/"$openssl".tar.gz > "$openssl".tar.gz
+test -f "$openssl".tar.gz || curl http://www.openssl.org/source/"$openssl".tar.gz > "$openssl".tar.gz
 tar zxf "$openssl".tar.gz
 (cd $openssl
- #./Configure darwin64-x86_64-cc shared --prefix=$OPENSSLINSTALLDIR
- ./config shared --prefix=$OPENSSLINSTALLDIR
+ #./Configure darwin64-x86_64-cc shared --prefix=$INSTALL_DIR
+ ./config shared --prefix=$INSTALL_DIR
  make && make install
 )
-chmod 755 $OPENSSLINSTALLDIR/lib/*.dylib
+chmod 755 $INSTALL_DIR/lib/*.dylib
 }
 
+do_libtool()
+{(
+libtool="libtool-2.2.6b"
+test -f "$libtool".tar.gz || curl http://ftp.gnu.org/gnu/libtool/"$libtool".tar.gz > "$libtool".tar.gz
+tar zxf "$libtool".tar.gz
+cd "$libtool"
+export CFLAGS="-arch i386"
+./configure --prefix ${INSTALL_DIR}
+make && make install
+)}
+
+
 # define the installation dir and the path to the new library
 # it will be installed locally in the home directory
-export OPENSSLINSTALLDIR=$HOME/instopenssl
-export DYLD_LIBRARY_PATH=$OPENSSLINSTALLDIR/lib
-#export QTDIR=$HOME/QtSDK/Desktop/Qt/4.8.1/gcc
+export INSTALL_DIR="`pwd`"/install
+export DYLD_LIBRARY_PATH=$INSTALL_DIR/lib
+export QTDIR=$INSTALL_DIR/Qt485
 
 XCA_DIR="`dirname $0`"
 XCA_DIR="`cd $XCA_DIR/.. && pwd`"
 doc=$XCA_DIR/doc/xca-doc.tgz
 test -f $doc || curl http://git.hohnstaedt.de/xca-doc.tgz > $doc
 
+do_libtool
 do_openssl
 
 # configure XCA and build the DMG file
 rm -rf xca-macbuild
-mkdir xca-macbuild
+mkdir -p xca-macbuild/doc
 cd xca-macbuild
+cp "$doc" doc
 
-$XCA_DIR/configure $OPENSSLINSTALLDIR
-make -j5 xca.dmg
+$XCA_DIR/configure $INSTALL_DIR
+make -j5 && make xca.dmg