Teach 'make' how to re-configure for MinGW.

diff --git a/GNUmakefile b/GNUmakefile
index b829e93b498f13ce5ce1f308e38930e62b04e48f..a2a630ba9d573c6e3f39d2a4f281bda90521ec69 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -32,6 +32,11 @@
 # run "configure" by hand.  But run autogen.sh first, if the source
 # was checked out directly from the repository.
 
+ifneq ($(MSYSTEM),)
+CFG = CONFIG_SITE=$(CURDIR)/nt/mingw-cfg.site
+else
+CFG =
+endif
 
 # If a Makefile already exists, just use it.
 
@@ -70,7 +75,7 @@ configure:
 Makefile: configure
        @echo >&2 'There seems to be no Makefile in this directory.'
        @echo >&2 'Running ./configure ...'
-       ./configure
+       $(CFG) ./configure
        @echo >&2 'Makefile built.'
 
 endif

diff --git a/Makefile.in b/Makefile.in
index 6e0f151ea1ab1e57b1c12a4c07c741cd2a499d0c..e84090806c3e19d3fdf40eeaa1aec2c6d16d7fdf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -393,9 +393,9 @@ $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
 
 config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
        if [ -x ./config.status ]; then \
-           ./config.status --recheck;  \
+           $(CFG) ./config.status --recheck;   \
        else                            \
-           $(srcdir)/configure $(CONFIGURE_FLAGS); \
+           $(CFG) $(srcdir)/configure $(CONFIGURE_FLAGS); \
        fi
 
 AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4