(info-nmake, info-gmake, clean-other-dirs-nmake): Change from ../man

to ../doc/emacs and ../doc/misc; and from ../lispref, ../lispintro to
../doc/lispref, ../doc/lispintro.

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 05e9a6658795c6544dad97cfccf70260c7f3cd0a..155f201aa1e72fb7fb5b4700dd617c70ad5f3dd0 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -232,23 +232,26 @@ install-other-dirs-gmake:
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install\r
 \r
 force-info:\r
-# Note that man/makefile knows how to\r
+# Note that doc/emacs/makefile knows how to\r
 # put the info files in $(infodir),\r
 # so we can do ok running make in the build dir.\r
 info: force-info info-$(MAKETYPE)\r
 \r
 info-nmake:\r
-       cd ..\man\r
+       cd ..\doc\emacs\r
        $(MAKE) $(MFLAGS) info\r
-       cd ..\lispref\r
+       cd ..\doc\misc\r
        $(MAKE) $(MFLAGS) info\r
-       cd ..\lispintro\r
+       cd ..\doc\lispref\r
+       $(MAKE) $(MFLAGS) info\r
+       cd ..\doc\lispintro\r
        $(MAKE) $(MFLAGS) info\r
 \r
 info-gmake:\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../man info\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispref info\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispintro info\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs info\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc info\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref info\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro info\r
 #\r
 # Maintenance\r
 #\r
@@ -265,13 +268,15 @@ clean-other-dirs-nmake:
        $(MAKE) $(MFLAGS) clean\r
        cd ..\lisp\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\lispintro\r
+       cd ..\doc\lispintro\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\lispref\r
+       cd ..\doc\lispref\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\leim\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\man\r
+       cd ..\doc\emacs\r
+       $(MAKE) $(MFLAGS) clean\r
+       cd ..\doc\misc\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\nt\r
 \r