From 6edca6fa2046f13f4fc0b7fa13b0368a78e4519b Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Thu, 16 Sep 2010 16:13:10 +0000
Subject: [PATCH] Win32 build: Remove installation directory before installing
 the new version. Require exact gwen/aqbanking version.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19581 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/install-impl.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
index 684d6fe71a..477bb239b7 100755
--- a/packaging/win32/install-impl.sh
+++ b/packaging/win32/install-impl.sh
@@ -754,6 +754,7 @@ function inst_libgsf() {
                 CPPFLAGS="${GNOME_CPPFLAGS}" \
                 LDFLAGS="${GNOME_LDFLAGS}"
             make
+            rm -rf ${_LIBGSF_UDIR}
             make install
         qpopd
         ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly"
@@ -785,9 +786,10 @@ function inst_goffice() {
             [ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR"
             [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
             make
+            rm -rf ${_GOFFICE_UDIR}
             make install
         qpopd
-        ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice-0.8-8.dll ] || die "goffice not installed correctly"
+        ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
         rm -rf ${TMP_UDIR}/goffice-*
         rm -rf ${TMP_UDIR}/libgsf-*
     fi
@@ -950,7 +952,7 @@ function inst_gwenhywfar() {
     _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
     add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
     add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --atleast-version=${GWENHYWFAR_VERSION} gwenhywfar
+    if quiet ${PKG_CONFIG} --exact-version=${GWENHYWFAR_VERSION} gwenhywfar
     then
         echo "Gwenhywfar already installed. skipping."
     else
@@ -984,6 +986,7 @@ function inst_gwenhywfar() {
             fi
             make
 #            [ "$CROSS_COMPILE" != "yes" ] && make check
+            rm -rf ${_GWENHYWFAR_UDIR}
             make install
         qpopd
         ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
@@ -1052,7 +1055,7 @@ function inst_aqbanking() {
     _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
     add_to_env ${_AQBANKING_UDIR}/bin PATH
     add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --atleast-version=${AQBANKING_VERSION} aqbanking
+    if quiet ${PKG_CONFIG} --exact-version=${AQBANKING_VERSION} aqbanking
     then
         echo "AqBanking already installed. skipping."
     else
@@ -1109,6 +1112,7 @@ function inst_aqbanking() {
                     --prefix=${_AQBANKING_UDIR}
             fi
             make
+            rm -rf ${_AQBANKING_UDIR}
             make install
         qpopd
         qpushd ${_AQBANKING_UDIR}/bin