r19581 - gnucash/trunk/packaging/win32 - Win32 build: Remove installation directory before installing the new version. Require exact gwen/aqbanking version.

[Christian Stimming]

Author: cstim
Date: 2010-09-16 12:13:10 -0400 (Thu, 16 Sep 2010)
New Revision: 19581
Trac: http://svn.gnucash.org/trac/changeset/19581

Modified:
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Remove installation directory before installing the new version. Require exact gwen/aqbanking version.

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-09-15 20:18:18 UTC (rev 19580)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-09-16 16:13:10 UTC (rev 19581)
@@ -754,6 +754,7 @@
                 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 @@
             [ -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 @@
     _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 @@
             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 @@
     _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 @@
                     --prefix=${_AQBANKING_UDIR}
             fi
             make
+            rm -rf ${_AQBANKING_UDIR}
             make install
         qpopd
         qpushd ${_AQBANKING_UDIR}/bin