X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/224e1caae160cccd6447db6228cc617765f7ad31..4cd0f2dc6f868bc76c2326db1a16b3bb21f78024:/GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index a2a630ba9d..22c57f5cb5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,6 @@
 # Build Emacs from a fresh tarball or version-control checkout.
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -32,12 +32,6 @@
 # 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.
 
 ifeq ($(wildcard Makefile),Makefile)
@@ -68,14 +62,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 ...'
-	$(CFG) ./configure
+	./configure
 	@echo >&2 'Makefile built.'
 
 endif