X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640..b51d2e5a656eab4019916cce3a142c6e4d56ec88:/msdos/mainmake.v2 diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index 1aea06d2a4..b4837b99fb 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-2012 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 autogen/README, 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 autogen/README),) 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/ @@ -162,7 +162,7 @@ TAGS tags: lib-src FRC ../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/s/msdos.h cd .. ./bin/etags --include=src/TAGS @@ -299,4 +299,3 @@ bootstrap-clean: FRC bootstrap: bootstrap-clean FRC command.com /e:2048 /c config msdos $(MAKE) $(MFLAGS) info all -