r14831 - gnucash/trunk/packaging/win32 - install.sh fixes:

[Andreas Köhler]

Author: andi5
Date: 2006-09-10 06:55:05 -0400 (Sun, 10 Sep 2006)
New Revision: 14831
Trac: http://svn.gnucash.org/trac/changeset/14831

Modified:
   gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff
   gnucash/trunk/packaging/win32/install.sh
Log:
install.sh fixes:
* Rename input dll in libz.dll.a from bin/zlib1.dll to zlib1.dll
* Add AUTOTOOLS_DIR\\bin to PATH of gnucash.bat because
  libgncmodule-0.dll depends on libltdl-3.dll
* correct goffice/Makefile.am to put libgoffice_{init,shutdown} into
  interface library


Modified: gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff	2006-09-09 23:15:38 UTC (rev 14830)
+++ gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff	2006-09-10 10:55:05 UTC (rev 14831)
@@ -105,7 +105,15 @@
  goffice_cairo_reqs="
 --- goffice-0.3.0/goffice/Makefile.am~	Sat Aug 26 20:52:04 2006
 +++ goffice-0.3.0/goffice/Makefile.am	Sat Aug 26 20:58:53 2006
-@@ -73,7 +73,7 @@
+@@ -66,14 +66,14 @@
+ include $(top_srcdir)/goffice.mk
+ 
+ if WITH_WIN32
+-LIB_PUBLIC_HDRS = $(libgoffice_1_la_HEADERS)
++LIB_PUBLIC_HDRS = $(libgoffice_0_la_HEADERS)
+ 
+ goffice.def: local.def app/local.def \
+ 	cut-n-paste/foocanvas/local.def \
  	data/local.def drawing/local.def graph/local.def \
  	gtk/local.def ms-compat/local.def utils/local.def
  	echo EXPORTS > $@ && \

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-09-09 23:15:38 UTC (rev 14830)
+++ gnucash/trunk/packaging/win32/install.sh	2006-09-10 10:55:05 UTC (rev 14831)
@@ -481,7 +481,12 @@
 	wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         qpushd $GNOME_DIR
             [ -f bin/zlib1.dll ] || mv zlib1.dll bin
-            [ -f lib/libz.dll.a ] || dlltool -D bin/zlib1.dll -d lib/zlib.def -l lib/libz.dll.a
+            if [ ! -f lib/libz.dll.a ]; then
+                qpushd bin
+                    dlltool -D zlib1.dll -d ../lib/zlib.def -l libz.dll.a
+                    mv libz.dll.a ../lib
+                qpopd
+            fi
             [ -f bin/libintl-2.dll ] || cp bin/intl.dll bin/libintl-2.dll
             _FREETYPE_VERSION=`echo $FREETYPE_DEV_URL | sed 's#.*freetype-\(.*\)-lib.zip#\1#'`
             cat > lib/pkgconfig/freetype2.pc <<EOF
@@ -745,7 +750,7 @@
 
     # Create a startup script that works without the msys shell
     qpushd ${_GNUCASH_WFSDIR}/bin
-    echo "set PATH=${GNUCASH_DIR}\\bin;${GNUCASH_DIR}\\lib\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GWRAP_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin" > gnucash.bat
+    echo "set PATH=${GNUCASH_DIR}\\bin;${GNUCASH_DIR}\\lib\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GWRAP_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin" > gnucash.bat
     echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.bat
     echo "set GNC_MODULE_PATH=${GNUCASH_DIR}\\lib\\gnucash" >> gnucash.bat
     echo "set GUILE_LOAD_PATH=${GUILE_DIR}\\share\\guile\\site;${GNUCASH_DIR}\\share\\gnucash\\guile-modules;${GNUCASH_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.bat