last changes for 0.9.1

INSTALL

@@ -27,6 +27,13 @@ Just the naming and invokation looks like it. Thus the
 usual way to configure and build a Package is the same:
 $ ./configure; make; make install
 
+You can build in a different subdirectory:
+ - cd into the build directory and
+ - call configure by its full path.
+For example, if you ar in the freshly unpacked xca-0.9.1 directory:
+  mkdir Build && cd Build && ../configure && make -j10
+To clean all built files: rm -rf Build
+
 If you have a special setup, you can predefine the following
 variables: CC, LD, STRIP, CFLAGS, prefix. e.g.:
 $ CC="ccache gcc" STRIP=: CFLAGS="-Wall -g" prefix=/opt/xca ./configure

INSTALL.w32

@@ -18,6 +18,10 @@ Use a W32 host to execute and install the selfextracting QT4....exe
 
 copy the installed tree to ./qt/
 
+Now you can either call xca-x.y.z/misc/build-w32.sh
+and wait until xca_setup.exe is built,
+or follow the steps below by hand:
+
 $ export INSTALL_DIR=`pwd`/install
 
 OpenSSL 0.9.8 and 1.0.0 are supported.

Makefile

@@ -11,9 +11,11 @@ export BUILD=$(shell pwd)
 
 ifneq ($(MAKECMDGOALS), distclean)
 ifneq ($(MAKECMDGOALS), clean)
+ifneq ($(MAKECMDGOALS), dist)
 include Local.mak
 endif
 endif
+endif
 
 VPATH=$(TOPDIR)
 SUBDIRS=lib widgets img

Rules.mak

@@ -3,6 +3,8 @@ export VERSION=$(shell cat $(TOPDIR)/VERSION )
 
 BASENAME=$(shell basename `pwd`)
 
+CPPFLAGS += -I\$(TOPDIR) -I\$(BUILD) -I\$(BUILD)/ui
+
 all: .build-stamp
 
 .build-stamp: $(OBJS)

VERSION

@@ -1 +1 @@
-0.9.1-rc1
+0.9.1

changelog

@@ -1,3 +1,4 @@
+xca 0.9.1 Fri Oct 21 08:13:26 2011
 
   * Close bug [ 3372449 ] All numeric names cannot be used
   * add search functionality for PKCS#11 libraries

configure

@@ -42,7 +42,6 @@ STDLIB="-L/usr/lib"
 prefix=${prefix:=/usr/local}
 CFLAGS=${CFLAGS:=-Wall -ggdb -O2}
 CC=${CC:=gcc}
-CF="-I\$(TOPDIR) -I\$(BUILD) -I\$(BUILD)/ui"
 LDFLAGS=""
 LIBS="-lstdc++"
 LDIRS=
@@ -54,6 +53,7 @@ test -z "$docdir" && docdir="${prefix}/share/xca"
 
 DVERSION="`gcc --version | grep apple-darwin || :`"
 case "$DVERSION" in
+  *-apple-darwin11*) DARWIN="Lion" ;;
   *-apple-darwin10*) DARWIN="SnowLeopard" ;;
   *-apple-darwin9*) DARWIN="Leopard" ;;
   *-apple-darwin*)
@@ -237,8 +237,8 @@ int main(){
 }
 EOF
 
-echo "${CC} $LIBS $LDIRS $CF $CFLAGS conftest.cpp -o conftest${SUFFIX}" >conftest.log
-if ${CC} $LIBS $LDIRS $CF $CFLAGS conftest.cpp -o conftest${SUFFIX} >> conftest.log 2>&1; then
+echo "${CC} $LIBS $LDIRS $CF $CFLAGS ${LDFLAGS} conftest.cpp -o conftest${SUFFIX}" >conftest.log
+if ${CC} $LIBS $LDIRS $CF $CFLAGS ${LDFLAGS} conftest.cpp -o conftest${SUFFIX} >> conftest.log 2>&1; then
   ./conftest${SUFFIX} || err "Unable to execute a freshly compiled application, maybe you have to adjust your LD_LIBRARY_PATH or /etc/ld.so.conf" && rm -rf conftest.cpp conftest${SUFFIX} conftest.log conftest.dSYM
 else
   err "Unable to compile a minimal application look at 'conftest.log' for errors"

lang/Makefile

@@ -27,7 +27,7 @@ app:
 	cd $(SYSROOT)/Developer/Applications/Qt/translations && \
 	  for x in $(QM_QT); do \
 	    test -f "$$x" && install $$x $(APPDIR)/Resources;\
-	  done
+	  done || :
 
 po2ts: $(TS_XCA)
 xca_%.ts.xml: %.po

misc/build-w32.sh

@@ -1,13 +1,14 @@
 #!/bin/sh -e
 
-XCA_DIR="`pwd`"/xca
+XCA_DIR="`dirname $0`"
+XCA_DIR="`cd $XCA_DIR/.. && pwd`"
 XCA_BUILD="`pwd`"/xca_build
 
 LIBTOOL_DIR="libtool-2.2.6b"
 LIBTOOL_GZ="${LIBTOOL_DIR}".tar.gz
 LIBTOOL_DL="http://ftp.gnu.org/gnu/libtool/${LIBTOOL_GZ}"
 
-OPENSSL_DIR="openssl-1.0.0d"
+OPENSSL_DIR="openssl-1.0.0e"
 OPENSSL_GZ="${OPENSSL_DIR}".tar.gz
 OPENSSL_DL="http://openssl.org/source/${OPENSSL_GZ}"
 OPENSSL_PATCH="$XCA_DIR/misc/openssl-1.0.0-mingw32-cross.patch"