Win32: Fix building of libgoffice.

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

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18633 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2010-02-10 19:26:06 +00:00
parent 38dfb101f3
commit b217a1ca81

View File

@ -692,7 +692,6 @@ function inst_libgsf() {
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 @@ function inst_goffice() {
_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 @@ function inst_goffice() {
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
}