*** empty log message ***

[gnu-emacs] / nt / makefile.w32-in

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 47787bae09eaa28e2f246a1777aa9dd8f258636d..10f6d6bebd2bf3d2e2b226eca2c4657f674c8349 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -69,7 +69,7 @@ which-sh:
 #\r
 # Build emacs\r
 #\r
-all:   which-sh $(BLD) $(ALL) all-other-dirs-$(MAKETYPE)\r
+all:   which-sh $(BLD) $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)\r
 \r
 all-other-dirs-nmake:\r
        cd ..\lib-src\r
@@ -105,6 +105,27 @@ recompile-gmake:
 ### special emacs executable is built from Lisp sources, which is then\r
 ### used to compile Lisp files.  The last step is a "normal" make.\r
 \r
+maybe-bootstrap: maybe-bootstrap-$(SHELLTYPE)\r
+\r
+# dummy target to force other targets to be evaluated.\r
+doit:\r
+\r
+maybe-bootstrap-CMD:   doit\r
+       @echo.\r
+       @if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing.  You should either\r
+       @if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow\r
+       @echo.\r
+       @if not EXIST ..\lisp\abbrev.elc exit -1\r
+\r
+maybe-bootstrap-SH: doit\r
+       @if [ ! -f ../lisp/abbrev.elc ] ; then \\r
+         echo; \\r
+         echo "Essential Lisp files seem to be missing.  You should either"; \\r
+         echo "do \`make bootstrap' or create \`lisp/abbrev.elc' somehow.";  \\r
+         echo; \\r
+         exit -1; \\r
+       fi\r
+\r
 bootstrap:     addsection bootstrap-$(MAKETYPE) all\r
 \r
 bootstrap-nmake:\r
@@ -113,21 +134,24 @@ bootstrap-nmake:
        cd ..\src\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\lib-src\r
-       $(MAKE) $(MFLAGS) clean DOC\r
+       $(MAKE) $(MFLAGS) clean\r
        cd ..\src\r
        $(MAKE) $(MFLAGS) bootstrap\r
        $(MAKE) $(MFLAGS) bootstrap-clean\r
        cd ..\lisp\r
        $(MAKE) $(MFLAGS) bootstrap\r
+       cd ..\lib-src\r
+       $(MAKE) $(MFLAGS) DOC\r
        cd ..\nt\r
 \r
 bootstrap-gmake:\r
        $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean\r
        $(MAKE) $(MFLAGS) -C ../src clean\r
-       $(MAKE) $(MFLAGS) -C ../lib-src clean DOC\r
+       $(MAKE) $(MFLAGS) -C ../lib-src clean\r
        $(MAKE) $(MFLAGS) -C ../src bootstrap\r
        $(MAKE) $(MFLAGS) -C ../src bootstrap-clean\r
        $(MAKE) $(MFLAGS) -C ../lisp bootstrap\r
+       $(MAKE) $(MFLAGS) -C ../lib-src DOC\r
 \r
 bootstrap-clean: bootstrap-clean-$(MAKETYPE)\r
 \r