diff msdos/mainmake.v2 @ 97668:eefd6603dc56

(emacs lispref lispintro): Chdir under doc/. (emacs): Renamed from `man', to reflect changes in doc directory structure. All callers changed. (clean mostlyclean distclean maintainer-clean extraclean): Chdir into doc/ for manuals. Add misc subdirectory. (src): Pass an empty BOOTSTRAPEMACS variable to src/Makefile. (install): Don't stubify/stubedit emacs.exe, this is now done by src/Makefile.

--- a/msdos/mainmake.v2	Sat Aug 23 17:01:46 2008 +0000
+++ b/msdos/mainmake.v2	Sat Aug 23 17:02:59 2008 +0000
@@ -67,7 +67,7 @@
 # Find out which version of Emacs this is.
 version := ${shell sed -n -e '/(defconst emacs-version/s/^[^"]*\("[^"]*"\).*/\1/p' lisp/version.el}
 
-all:	maybe_bootstrap lib-src src man lispref lispintro
+all:	maybe_bootstrap lib-src src emacs lispref lispintro
 
 lib-src: FRC
 	cd lib-src
@@ -76,7 +76,7 @@
 
 src: FRC
 	cd src
-	$(MAKE) top_srcdir=${top_srcdir}
+	$(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS=""
 	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
@@ -90,10 +90,10 @@
 	cd ..
 	if exist leim\Makefile redir $(MAKE) -C leim top_srcdir=${top_srcdir}
 
-man lispref lispintro:	FRC
-	cd $@
+emacs lispref lispintro:	FRC
+	cd doc/$@
 	$(MAKE) top_srcdir=${top_srcdir} info
-	cd ..
+	cd ../..
 
 install: all
 	if not exist bin\nul md bin
@@ -103,8 +103,6 @@
 	if exist fns.el update fns.el ../bin/fns.el
 	cd ..
 	cd src
-	stubify emacs
-	stubedit emacs.exe minstack=512k
 	mv -f emacs.exe ../bin/
 	cd ..
 	djecho -s "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)" \
@@ -144,7 +142,11 @@
 	cd oldxmenu
 	-$(MAKE) $(MFLAGS) $@
 	cd ..
-	cd man
+	cd doc
+	cd emacs
+	-$(MAKE) $(MFLAGS) $@
+	cd ..
+	cd misc
 	-$(MAKE) $(MFLAGS) $@
 	cd ..
 	cd lispref
@@ -153,6 +155,7 @@
 	cd lispintro
 	-$(MAKE) $(MFLAGS) $@
 	cd ..
+	cd ..
 	cd leim
 	if exist Makefile redir $(MAKE) $(MFLAGS) $@
 	cd ..
@@ -170,7 +173,11 @@
 	cd lib-src
 	$(MAKE) $(MFLAGS) $@
 	cd ..
-	cd man
+	cd doc
+	cd emacs
+	-$(MAKE) $(MFLAGS) $@
+	cd ..
+	cd misc
 	-$(MAKE) $(MFLAGS) $@
 	cd ..
 	cd lispref
@@ -179,6 +186,7 @@
 	cd lispintro
 	-$(MAKE) $(MFLAGS) $@
 	cd ..
+	cd ..
 	cd leim
 	if exist Makefile redir $(MAKE) $(MFLAGS) $@
 	cd ..
@@ -197,7 +205,11 @@
 	cd lib-src
 	$(MAKE) $(MFLAGS) $@
 	cd ..
-	cd man
+	cd doc
+	cd emacs
+	-$(MAKE) $(MFLAGS) $@
+	cd ..
+	cd misc
 	-$(MAKE) $(MFLAGS) $@
 	cd ..
 	cd lispref
@@ -206,6 +218,7 @@
 	cd lispintro
 	-$(MAKE) $(MFLAGS) $@
 	cd ..
+	cd ..
 	cd leim
 	if exist Makefile redir $(MAKE) $(MFLAGS) $@
 	cd ..
@@ -242,9 +255,10 @@
 bootstrap-clean-before: FRC
 	cd src;      $(MAKE) $(MFLAGS) mostlyclean; cd ..
 	cd lib-src;  $(MAKE) $(MFLAGS) clean;       cd ..
-	-cd man;     $(MAKE) $(MFLAGS) clean;       cd ..
+	-cd doc/emacs; $(MAKE) $(MFLAGS) clean;     cd ..
+	-cd misc;    $(MAKE) $(MFLAGS) clean;       cd ..
 	-cd lispref; $(MAKE) $(MFLAGS) clean;       cd ..
-	-cd lispintro; $(MAKE) $(MFLAGS) clean;     cd ..
+	-cd lispintro; $(MAKE) $(MFLAGS) clean;     cd ..; cd ..
 	cd leim;     if exist Makefile redir $(MAKE) $(MFLAGS) clean; cd ..
 
 bootstrap-clean-after: