r18620 - gnucash/trunk/packaging/win32 - Win32: Hopefully fix goffice installation.
Christian Stimming
cstim at code.gnucash.org
Sun Feb 7 14:58:18 EST 2010
Author: cstim
Date: 2010-02-07 14:58:18 -0500 (Sun, 07 Feb 2010)
New Revision: 18620
Trac: http://svn.gnucash.org/trac/changeset/18620
Modified:
gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Hopefully fix goffice installation.
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2010-02-07 13:28:11 UTC (rev 18619)
+++ gnucash/trunk/packaging/win32/install.sh 2010-02-07 19:58:18 UTC (rev 18620)
@@ -701,7 +701,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
+ if quiet ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ]
then
echo "goffice already installed. skipping."
else
@@ -723,7 +723,7 @@
make
make install
qpopd
- ${PKG_CONFIG} --exists libgoffice-0.8 || 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-*
fi
}
More information about the gnucash-changes
mailing list