Fix for sc-nested-citation-p in supercite.el.

[bpt/emacs.git] / msdos / mainmake.v2

diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index d53ec97..3ed7525 100644 (file)
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -1,7 +1,7 @@
 # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -67,11 +67,17 @@ top_srcdir := $(subst \,/,$(shell cd))
 # Find out which version of Emacs this is.
 version := ${shell sed -n -e '/(defconst emacs-version/s/^[^"]*\("[^"]*"\).*/\1/p' lisp/version.el}
 
-# Do we need to bootstrap?
+# Q: Do we need to bootstrap?
+# A: Only if we find admin/admin.el, i.e. we are building out of CVS,
+#    and src/b-emacs.exe does not exist.  This avoids building a
+#    bootstrap-emacs and recompiling Lisp files when building a
+#    pretest/release tarball.
 boot :=
+ifneq ($(wildcard admin/admin.el),)
 ifeq ($(wildcard src/b-emacs.exe),)
 boot := b-emacs.exe
 endif
+endif
 
 # Subdirectories to run Make.  `lisp' is not included because the
 # compiled lisp files are part of the distribution.  (If we are
@@ -98,9 +104,11 @@ src: FRC
        $(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}"
        djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \
                  '/environment *TERM/s/^.*/set environment TERM internal/' \
-                 '/x_error_quitter/s/^.*/set environment NAME root/' >gdb.sed
+              >gdb.sed
        sed -f gdb.sed _gdbinit >gdb.tmp
        djecho -a gdb.tmp -s 'set environment USER root' \
+                            'set environment NAME root' \
+                            'set environment USERNAME root' \
                             'set environment EMACSPATH $(top_srcdir)/bin' \
                             'set environment SHELL $(subst \,/,$(COMSPEC))' \
                             'set environment PATH $(subst \,/,$(PATH))'
@@ -271,7 +279,7 @@ bootstrap-clean: FRC
        ${top_bootclean}
 
 bootstrap: bootstrap-clean FRC
-       config msdos
+       command.com /e:2048 /c config msdos
        $(MAKE) $(MFLAGS) info all
 
 # arch-tag: 6fee5130-4c53-46c6-93d3-d0ea852298b9