From 904da3cddfe4dda5d24b84dc417af8fc21d0f6b6 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Mon, 21 May 2012 21:18:33 +0000
Subject: [PATCH] Add EXTRA_CFLAGS to inst_gnucash compile line so that cflags
 can be added by custom.sh

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@22195 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/install-impl.sh | 2 +-
 packaging/win32/install.sh      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
index c563955363..f332731551 100755
--- a/packaging/win32/install-impl.sh
+++ b/packaging/win32/install-impl.sh
@@ -1422,7 +1422,7 @@ function inst_gnucash() {
             --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}"
 
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index 03019b1bb1..836d421e44 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -91,9 +91,9 @@ add_step inst_swig
 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