r14733 - gnucash/trunk - revert back to checking for libgoffice-0.3.pc
Derek Atkins
warlord at cvs.gnucash.org
Sat Aug 26 19:06:35 EDT 2006
Author: warlord
Date: 2006-08-26 19:06:35 -0400 (Sat, 26 Aug 2006)
New Revision: 14733
Trac: http://svn.gnucash.org/trac/changeset/14733
Modified:
gnucash/trunk/
gnucash/trunk/packaging/win32/install.sh
Log:
revert back to checking for libgoffice-0.3.pc
Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
- d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13141
+ d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13143
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2006-08-26 22:59:23 UTC (rev 14732)
+++ gnucash/trunk/packaging/win32/install.sh 2006-08-26 23:06:35 UTC (rev 14733)
@@ -531,7 +531,7 @@
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
set +e
- quiet pkg-config --exists libgoffice-1
+ quiet pkg-config --exists libgoffice-0.3
if [ $? = 0 ] ; then
set -e
echo "goffice already installed. skipping."
@@ -564,8 +564,7 @@
make install
qpopd
fi
- pkg-config --exists libgoffice-0.3 && die "Sorry, for goffice gnucash expects a pkgconfig file with the name libgoffice-1.pc, but you have an installed file libgoffice-0.3.pc. You should probably rename that file."
- pkg-config --exists libgoffice-1 || die "goffice not installed correctly"
+ pkg-config --exists libgoffice-0.3 || die "goffice not installed correctly"
}
function inst_svn() {
More information about the gnucash-changes
mailing list