mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Teach 'make' how to re-configure for MinGW.
This commit is contained in:
parent
f576f7fb04
commit
224e1caae1
2 changed files with 8 additions and 3 deletions
|
|
@ -32,6 +32,11 @@
|
||||||
# run "configure" by hand. But run autogen.sh first, if the source
|
# run "configure" by hand. But run autogen.sh first, if the source
|
||||||
# was checked out directly from the repository.
|
# 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.
|
# If a Makefile already exists, just use it.
|
||||||
|
|
||||||
|
|
@ -70,7 +75,7 @@ configure:
|
||||||
Makefile: configure
|
Makefile: configure
|
||||||
@echo >&2 'There seems to be no Makefile in this directory.'
|
@echo >&2 'There seems to be no Makefile in this directory.'
|
||||||
@echo >&2 'Running ./configure ...'
|
@echo >&2 'Running ./configure ...'
|
||||||
./configure
|
$(CFG) ./configure
|
||||||
@echo >&2 'Makefile built.'
|
@echo >&2 'Makefile built.'
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -393,9 +393,9 @@ $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
|
||||||
|
|
||||||
config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
|
config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
|
||||||
if [ -x ./config.status ]; then \
|
if [ -x ./config.status ]; then \
|
||||||
./config.status --recheck; \
|
$(CFG) ./config.status --recheck; \
|
||||||
else \
|
else \
|
||||||
$(srcdir)/configure $(CONFIGURE_FLAGS); \
|
$(CFG) $(srcdir)/configure $(CONFIGURE_FLAGS); \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
|
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue