diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2008-08-23 17:02:59 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2008-08-23 17:02:59 +0000 |
| commit | d945fac60bbd11c05c3e16d4ca8039b390310686 (patch) | |
| tree | e84fbdd8a7db7b8069f3c217f4ed4649cc01ff2a /msdos/mainmake.v2 | |
| parent | cbcc5ad47d6a1498e3588cb626fba4a4d7ee90de (diff) | |
| download | emacs-d945fac60bbd11c05c3e16d4ca8039b390310686.tar.gz | |
(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.
Diffstat (limited to 'msdos/mainmake.v2')
| -rw-r--r-- | msdos/mainmake.v2 | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index 5497e45b1b2..338c2b8505b 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -67,7 +67,7 @@ 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} -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 @@ lib-src: FRC 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 @@ src: FRC 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 @@ install: all 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 @@ clean mostlyclean: 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 @@ clean mostlyclean: cd lispintro -$(MAKE) $(MFLAGS) $@ cd .. + cd .. cd leim if exist Makefile redir $(MAKE) $(MFLAGS) $@ cd .. @@ -170,7 +173,11 @@ distclean maintainer-clean: FRC 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 @@ distclean maintainer-clean: FRC cd lispintro -$(MAKE) $(MFLAGS) $@ cd .. + cd .. cd leim if exist Makefile redir $(MAKE) $(MFLAGS) $@ cd .. @@ -197,7 +205,11 @@ extraclean: 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 @@ extraclean: cd lispintro -$(MAKE) $(MFLAGS) $@ cd .. + cd .. cd leim if exist Makefile redir $(MAKE) $(MFLAGS) $@ cd .. @@ -242,9 +255,10 @@ bootstrap-src: 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: |