3 files changed, 6 insertions, 12 deletions
diff --git a/src/gmp.mk b/src/gmp.mk
index 8924ac7..c03b837 100644
--- a/src/gmp.mk
+++ b/src/gmp.mk
@@ -21,10 +21,7 @@ endef
 
 define $(PKG)_BUILD
     cd '$(1)' && CC_FOR_BUILD=gcc ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(MXE_CONFIGURE_OPTS) \
         --enable-cxx \
         --without-readline
     $(MAKE) -C '$(1)' -j '$(JOBS)'
@@ -36,6 +33,7 @@ define $(PKG)_BUILD
     cp -R '$(1)/tests' '$(PREFIX)/$(TARGET)/bin/$(PKG)-tests'
     (printf 'date /t >  all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n'; \
      printf 'time /t >> all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n'; \
+     printf 'set PATH=..\\;%%PATH%%\r\n'; \
      printf 'for /R %%%%f in (*.exe) do %%%%f || echo %%%%f fail >> all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n';) \
      > '$(PREFIX)/$(TARGET)/bin/$(PKG)-tests/all-tests-$(PKG)-$($(PKG)_VERSION).bat'
 endef
diff --git a/src/mpc.mk b/src/mpc.mk
index b499c72..5852f0a 100644
--- a/src/mpc.mk
+++ b/src/mpc.mk
@@ -19,10 +19,7 @@ endef
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --enable-static \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        $(MXE_CONFIGURE_OPTS) \
         --with-gmp='$(PREFIX)/$(TARGET)/' \
         --with-mpfr='$(PREFIX)/$(TARGET)/'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
@@ -34,6 +31,7 @@ define $(PKG)_BUILD
     cp -R '$(1)/tests' '$(PREFIX)/$(TARGET)/bin/$(PKG)-tests'
     (printf 'date /t >  all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n'; \
      printf 'time /t >> all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n'; \
+     printf 'set PATH=..\\;%%PATH%%\r\n'; \
      printf 'for /R %%%%f in (*.exe) do %%%%f || echo %%%%f fail >> all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n';) \
      > '$(PREFIX)/$(TARGET)/bin/$(PKG)-tests/all-tests-$(PKG)-$($(PKG)_VERSION).bat'
 endef
diff --git a/src/mpfr.mk b/src/mpfr.mk
index 89c945d..d17850f 100644
--- a/src/mpfr.mk
+++ b/src/mpfr.mk
@@ -20,10 +20,7 @@ endef
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --enable-static \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        $(MXE_CONFIGURE_OPTS) \
         --enable-threads=win32 \
         --with-gmp-include='$(PREFIX)/$(TARGET)/include/'
         --with-gmp-lib='$(PREFIX)/$(TARGET)/lib/'
@@ -36,6 +33,7 @@ define $(PKG)_BUILD
     cp -R '$(1)/tests' '$(PREFIX)/$(TARGET)/bin/$(PKG)-tests'
     (printf 'date /t >  all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n'; \
      printf 'time /t >> all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n'; \
+     printf 'set PATH=..\\;%%PATH%%\r\n'; \
      printf 'for /R %%%%f in (*.exe) do %%%%f || echo %%%%f fail >> all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n';) \
      > '$(PREFIX)/$(TARGET)/bin/$(PKG)-tests/all-tests-$(PKG)-$($(PKG)_VERSION).bat'
 endef