diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-04-17 22:42:10 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-04-17 22:42:10 +0300 |
| commit | 224e1caae160cccd6447db6228cc617765f7ad31 (patch) | |
| tree | aa512237ffe17bd47d66fc232abbcbc6f8a37904 | |
| parent | f576f7fb042d50ff965513f4679aa68343d0a7ee (diff) | |
| download | emacs-224e1caae160cccd6447db6228cc617765f7ad31.tar.gz | |
Teach 'make' how to re-configure for MinGW.
| -rw-r--r-- | GNUmakefile | 7 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index b829e93b498..a2a630ba9d5 100644 --- 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 6e0f151ea1a..e84090806c3 100644 --- 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 |