r22195 - gnucash/branches/2.4/packaging/win32 - Add EXTRA_CFLAGS to inst_gnucash compile line so that cflags can be added by custom.sh

[John Ralls]

Author: jralls
Date: 2012-05-21 17:18:33 -0400 (Mon, 21 May 2012)
New Revision: 22195
Trac: http://svn.gnucash.org/trac/changeset/22195

Modified:
   gnucash/branches/2.4/packaging/win32/install-impl.sh
   gnucash/branches/2.4/packaging/win32/install.sh
Log:
Add EXTRA_CFLAGS to inst_gnucash compile line so that cflags can be added by custom.sh

Modified: gnucash/branches/2.4/packaging/win32/install-impl.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/install-impl.sh	2012-05-21 19:47:28 UTC (rev 22194)
+++ gnucash/branches/2.4/packaging/win32/install-impl.sh	2012-05-21 21:18:33 UTC (rev 22195)
@@ -1422,7 +1422,7 @@
             --enable-binreloc \
             --enable-locale-specific-tax \
             --with-html-engine=webkit \
-            CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
+            CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
             LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
             PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
 

Modified: gnucash/branches/2.4/packaging/win32/install.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/install.sh	2012-05-21 19:47:28 UTC (rev 22194)
+++ gnucash/branches/2.4/packaging/win32/install.sh	2012-05-21 21:18:33 UTC (rev 22195)
@@ -91,9 +91,9 @@
 add_step inst_pcre
 add_step inst_libbonoboui
 add_step inst_libgsf
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_hh
-fi
+#if [ "$CROSS_COMPILE" != "yes" ]; then
+# add_step inst_hh
+#fi
 add_step inst_goffice
 #add_step inst_glade
 add_step inst_opensp