r18633 - gnucash/trunk/packaging/win32 - Win32: Fix building of libgoffice.

[Christian Stimming]

Author: cstim
Date: 2010-02-10 14:26:06 -0500 (Wed, 10 Feb 2010)
New Revision: 18633
Trac: http://svn.gnucash.org/trac/changeset/18633

Modified:
   gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Fix building of libgoffice.

Required libgsf to not remove the build directory, hence part
of r18559 need to be reverted.

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2010-02-09 18:24:16 UTC (rev 18632)
+++ gnucash/trunk/packaging/win32/install.sh	2010-02-10 19:26:06 UTC (rev 18633)
@@ -692,7 +692,6 @@
             make install
         qpopd
         ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly"
-        rm -rf ${TMP_UDIR}/libgsf-*
     fi
 }
 
@@ -701,7 +700,7 @@
     _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
     add_to_env $_GOFFICE_UDIR/bin PATH
     add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ]
+    if quiet ${PKG_CONFIG} --exists libgoffice-0.8
     then
         echo "goffice already installed.  skipping."
     else
@@ -725,6 +724,7 @@
         qpopd
         ${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
 }