rm leim-list.el, add quail/*.elc

[gnu-emacs] / msdos / mainmake.v2

diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 57d2ec17744120aa086e084d0e7acf4b826fb275..2e613156e335ee674318aaf3222be85e52d1142f 100644 (file)
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -29,38 +29,61 @@
 # make extraclean
 #      Still more severe - delete backup and autosave files, too.
 
+# This gork is required for those who use a Unix-style shell, and
+# have SHELL in the environment pointing to it.  Here we force
+# Make to use COMMAND.COM instead.  This Makefile won't work otherwise.
+# (The /xyzzy directory is used to minimize the chance that someone
+# actually has such a directory with an incompatible command.com.  We
+# used to have /dos there, but some Windows installations have an old
+# version of DOS stashed in that directory, and command.com from there
+# won't run on Windows, complaining about "Incorrect DOS version".
+# Make will look up PATH for the shell executable, so the directory name
+# is not important.)
+SHELL=/xyzzy/command
+MAKESHELL=/xyzzy/command
+
 # Generate a full pathname of the top-level installation directory
-topdir := $(subst \,/,$(shell cd))
+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:   lib-src src
+all:   lib-src src man
 
 lib-src: FRC
        cd lib-src
-       $(MAKE)
+       $(MAKE) top_srcdir=${top_srcdir} version=${version}
        cd ..
 
 src: FRC
        cd src
-       $(MAKE)
-       redir -o gdb.sed echo '/-geometry/s,^.*,set environment HOME $(topdir),'
+       $(MAKE) top_srcdir=${top_srcdir}
+       redir -o gdb.sed echo '/-geometry/s,^.*,set environment HOME $(top_srcdir),'
        redir -oa gdb.sed echo '/environment *TERM/s/^.*/set environment TERM internal/'
        redir -oa gdb.sed echo '/x_error_quitter/s/^.*/set environment NAME root/'
        redir -o gdb.tmp sed -f gdb.sed _gdbinit
        redir -oa gdb.tmp echo 'set environment USER root'
-       redir -oa gdb.tmp echo 'set environment EMACSPATH $(topdir)/bin'
+       redir -oa gdb.tmp echo 'set environment EMACSPATH $(top_srcdir)/bin'
        redir -oa gdb.tmp echo 'set environment SHELL $(subst \,/,$(COMSPEC))'
        redir -oa gdb.tmp echo 'set environment PATH $(subst \,/,$(PATH))'
        update gdb.tmp gdb.ini
        rm -f gdb.tmp gdb.sed
        cd ..
+       if exist leim\Makefile redir $(MAKE) -C leim top_srcdir=${top_srcdir}
+
+man:   FRC
+       cd man
+       $(MAKE) top_srcdir=${top_srcdir}
+       cd ..
 
 install: all
-       if not exist bin\\nul md bin
+       if not exist bin\nul md bin
        cd lib-src
        if exist hexl.exe mv -f hexl.exe ../bin
        if exist etags.exe mv -f etags.exe ../bin
        if exist ctags.exe mv -f ctags.exe ../bin
        if exist b2m.exe mv -f b2m.exe ../bin
+       if exist fns.el update fns.el ../bin/fns.el
        cd ..
        cd src
        stubify emacs
@@ -75,7 +98,7 @@ TAGS tags:    lib-src FRC
        if exist etags.exe mv -f etags.exe ../bin
        cd ..
        cd lisp
-       ../bin/etags [a-zA-Z]*.el [a-z][A-Z]*/[a-zA-Z]*.el
+       ../bin/etags [a-zA-Z]*.el [a-zA-Z]*/[a-zA-Z]*.el
        cd ..
        cd src
        ../bin/etags --include=../lisp/TAGS \
@@ -96,3 +119,6 @@ clean:
        cd oldxmenu
        -$(MAKE) clean
        cd ..
+       cd leim
+       if exist Makefile redir $(MAKE) clean
+       cd ..