X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a57471f93507c55b55ee9e28c493ba78b46796e3..af05bef2d1985fb9bd8485f3084f3bfe282a911f:/msdos/mainmake.v2

diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 1aea06d2a4..2cc71bbf37 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -1,6 +1,6 @@
 # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
 
-# Copyright (C) 1996-2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -64,12 +64,13 @@ MAKESHELL=/xyzzy/command
 top_srcdir := $(subst \,/,$(shell cd))
 
 # Q: Do we need to bootstrap?
-# A: Only if we find admin/admin.el, i.e. we are building out of 
-#    a VCS-checkout (not a release) and src/b-emacs.exe does not exist.
+# A: Only if we find msdos/autogen/Makefile.in, i.e. we are building out of
+#    a VCS-checkout (not a release), and src/b-emacs.exe does not exist.
 #    This avoids building a bootstrap-emacs and recompiling Lisp files
-#    when building a pretest/release tarball.
+#    when building a pretest/release tarball.  Recompiling Lisp files
+#    is BAD because lisp/Makefile.in requires a Unixy shell.
 boot :=
-ifneq ($(wildcard admin/admin.el),)
+ifneq ($(wildcard msdos/autogen/Makefile.in),)
 ifeq ($(wildcard src/b-emacs.exe),)
 boot := b-emacs.exe
 endif
@@ -132,7 +133,6 @@ install: all
 	cd lib-src
 	command.com /c >/dev/null for %p in (hexl etags ctags ebrowse) do\
 	   if exist %p.exe mv -f %p.exe ../bin
-	if exist fns.el update fns.el ../bin/fns.el
 	cd ..
 	cd src
 	mv -f emacs.exe ../bin/
@@ -161,8 +161,7 @@ TAGS tags:	lib-src FRC
 	cd src
 	../bin/etags --include=../lisp/TAGS \
 	 --regex='/[ 	]*DEFVAR_[A-Z_ 	(]+"\([^"]+\)"/' \
-	 $(CURDIR)/src/*.c $(CURDIR)/src/*.h \
-         $(CURDIR)/src/s/msdos.h $(CURDIR)/src/m/intel386.h
+	 $(CURDIR)/src/*.c $(CURDIR)/src/*.h
 	cd ..
 	./bin/etags --include=src/TAGS
 
@@ -269,7 +268,7 @@ extraclean:
 
 bootstrap-clean: FRC
 	cd lib
-	$(MAKE) $(MFLAGS) $@
+	-$(MAKE) $(MFLAGS) maintainer-clean
 	cd ..
 	cd src
 	$(MAKE) $(MFLAGS) $@
@@ -299,4 +298,3 @@ bootstrap-clean: FRC
 bootstrap: bootstrap-clean FRC
 	command.com /e:2048 /c config msdos
 	$(MAKE) $(MFLAGS) info all
-