# HG changeset patch
# User Tony Theodore <tonyt@logyst.com>
# Date 1347901678 -36000
# Node ID ab030b2952d72f2b5bd1a3fa37f080de6980cd60
# Parent  f4283ad823bfb94956f0b7694b6f5b30c1d2d4a6# Parent  61643b8b512217da82dbdd39990d74a63da59883
Merge branch 'master' of github.com:mxe/mxe

diff -r 61643b8b5122 -r ab030b2952d7 src/libgda.mk
--- a/src/libgda.mk	Mon Sep 17 17:48:01 2012 +0200
+++ b/src/libgda.mk	Tue Sep 18 03:07:58 2012 +1000
@@ -16,6 +16,9 @@
 endef
 
 define $(PKG)_BUILD
+    $(SED) -i 's,glib-mkenums,'$(PREFIX)/$(TARGET)/bin/glib-mkenums',g' '$(1)/libgda/Makefile.in'
+    $(SED) -i 's,glib-mkenums,'$(PREFIX)/$(TARGET)/bin/glib-mkenums',g' '$(1)/libgda/sql-parser/Makefile.in'
+    $(SED) -i 's,glib-mkenums,'$(PREFIX)/$(TARGET)/bin/glib-mkenums',g' '$(1)/libgda-ui/Makefile.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
@@ -28,7 +31,8 @@
         --without-firebird \
         --without-java \
         --enable-binreloc \
-        --disable-crypto
+        --disable-crypto \
+        GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef