Sync to HEAD

[bpt/emacs.git] / nt / makefile.w32-in

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 4e8265f..915259e 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -179,7 +179,6 @@ install: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
        - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin\r
-       - $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin\r
        - "$(INSTALL_DIR)/bin/addpm" /q\r
        - $(DEL) ../same-dir.tst\r
        - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
@@ -214,6 +213,15 @@ install-other-dirs-gmake:
        $(MAKE) $(MFLAGS) -C ../lisp install\r
        $(MAKE) $(MFLAGS) -C ../leim install\r
 \r
+force-info:\r
+# Note that man/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\r
+       (cd ..\man && $(MAKE) $(MFLAGS) info)\r
+       (cd ..\lispref && $(MAKE) $(MFLAGS) info)\r
+       (cd ..\lispintro && $(MAKE) $(MFLAGS) info)\r
+\r
 #\r
 # Maintenance\r
 #\r
@@ -229,8 +237,14 @@ clean-other-dirs-nmake:
        $(MAKE) $(MFLAGS) clean\r
        cd ..\lisp\r
        $(MAKE) $(MFLAGS) clean\r
+       cd ..\lispintro\r
+       $(MAKE) $(MFLAGS) clean\r
+       cd ..\lispref\r
+       $(MAKE) $(MFLAGS) clean\r
        cd ..\leim\r
        $(MAKE) $(MFLAGS) clean\r
+       cd ..\man\r
+       $(MAKE) $(MFLAGS) clean\r
        cd ..\nt\r
 \r
 clean-other-dirs-gmake:\r
@@ -258,3 +272,5 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE)
 \r
 realclean: cleanall\r
        - $(DEL_TREE) ../bin\r
+\r
+# arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219\r