Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

[bpt/emacs.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index b829e93..25c586d 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.
 
@@ -63,14 +68,14 @@ default $(filter-out configure Makefile,$(MAKECMDGOALS)): Makefile
 
 configure:
        @echo >&2 'There seems to be no "configure" file in this directory.'
-       @echo >&2 'Running ./autogen.sh || autogen/copy_autogen ...'
-       ./autogen.sh || autogen/copy_autogen
+       @echo >&2 'Running ./autogen.sh ...'
+       ./autogen.sh
        @echo >&2 '"configure" file built.'
 
 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