diff nt/makefile.w32-in @ 88155:d7ddb3e565de

sync with trunk

--- a/nt/makefile.w32-in	Sun Jan 15 23:02:10 2006 +0000
+++ b/nt/makefile.w32-in	Mon Jan 16 00:03:54 2006 +0000
@@ -1,5 +1,6 @@
-#  Makefile for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
+#    2005 Free Software Foundation, Inc.
 #
 #  Top level makefile for building GNU Emacs on Windows NT
 #
@@ -17,8 +18,8 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
+#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
 
 ALL		= addpm ddeclient runemacs cmdproxy addsection preprep
 
@@ -111,10 +112,10 @@
 doit:
 
 maybe-bootstrap-CMD:	doit
-	@echo.
+	@echo .
 	@if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing.  You should either
 	@if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow
-	@echo.
+	@echo .
 	@if not EXIST ..\lisp\abbrev.elc exit -1
 
 maybe-bootstrap-SH: doit
@@ -139,7 +140,7 @@
 	$(MAKE) $(MFLAGS) bootstrap
 	$(MAKE) $(MFLAGS) bootstrap-clean
 	cd ..\lisp
-	$(MAKE) $(MFLAGS) bootstrap
+	$(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap
 	cd ..\lib-src
 	$(MAKE) $(MFLAGS) DOC
 	cd ..\nt
@@ -179,7 +180,6 @@
 	- $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
 	- $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
 	- $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
-	- $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin
 	- "$(INSTALL_DIR)/bin/addpm" /q
 	- $(DEL) ../same-dir.tst
 	- $(DEL) $(INSTALL_DIR)/same-dir.tst
@@ -214,6 +214,24 @@
 	$(MAKE) $(MFLAGS) -C ../lisp install
 	$(MAKE) $(MFLAGS) -C ../leim install
 
+force-info:
+# Note that man/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
+	$(MAKE) $(MFLAGS) info
+	cd ..\lispref
+	$(MAKE) $(MFLAGS) info
+	cd ..\lispintro
+	$(MAKE) $(MFLAGS) info
+
+info-gmake:
+	$(MAKE) $(MFLAGS) -C ../man info
+	$(MAKE) $(MFLAGS) -C ../lispref info
+	$(MAKE) $(MFLAGS) -C ../lispintro info
 #
 # Maintenance
 #
@@ -229,8 +247,14 @@
 	$(MAKE) $(MFLAGS) clean
 	cd ..\lisp
 	$(MAKE) $(MFLAGS) clean
+	cd ..\lispintro
+	$(MAKE) $(MFLAGS) clean
+	cd ..\lispref
+	$(MAKE) $(MFLAGS) clean
 	cd ..\leim
 	$(MAKE) $(MFLAGS) clean
+	cd ..\man
+	$(MAKE) $(MFLAGS) clean
 	cd ..\nt
 
 clean-other-dirs-gmake: