From: Glenn Morris <rgm@gnu.org>
Date: Thu, 6 Sep 2007 07:19:48 +0000 (+0000)
Subject: (info-nmake, info-gmake, clean-other-dirs-nmake): Change from ../man
X-Git-Tag: emacs-pretest-23.0.90~11062
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d038b84d6c22f2270b3964ea40818129b138c025;p=emacs.git

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