Merge from emacs-23

[gnu-emacs] / nt / makefile.w32-in

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 88ea12906173047657788022952fec68022d0bf6..73920e152ce6c460dbfe328276987b299f38a1b7 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -23,6 +23,10 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out\r
 #        (and remove or replace this comment).\r
 \r
+VERSION                = 24.0.50\r
+\r
+TMP_DIST_DIR   = emacs-$(VERSION)\r
+\r
 TRES           = $(BLD)/emacs.res\r
 CLIENTRES      = $(BLD)/emacsclient.res\r
 \r
@@ -197,12 +201,16 @@ $(INSTALL_DIR)/bin: $(INSTALL_DIR)
 #\r
 # Build and install emacs in INSTALL_DIR\r
 #\r
-install: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)\r
+.PHONY: install-bin install-shortcuts\r
+\r
+install: install-bin install-shortcuts\r
+\r
+install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)\r
        - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin\r
-       - "$(INSTALL_DIR)/bin/addpm" -q\r
+       - $(CP) README.W32 $(INSTALL_DIR)\r
        - $(DEL) ../same-dir.tst\r
        - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
        echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"\r
@@ -238,6 +246,26 @@ install-other-dirs-gmake:
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install\r
 \r
+install-shortcuts:\r
+       "$(INSTALL_DIR)/bin/addpm" -q\r
+\r
+dist: install-bin\r
+       mkdir $(TMP_DIST_DIR)\r
+       $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)\r
+       $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)\r
+       $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)\r
+       $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR)\r
+       $(CP) "$(INSTALL_DIR)/INSTALL" $(TMP_DIST_DIR)\r
+       $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR)\r
+       $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR)\r
+       $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR)\r
+       $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR)\r
+       $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR)\r
+       $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR)\r
+       $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin\r
+       $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE)\r
+       $(DEL_TREE) $(TMP_DIST_DIR)\r
+\r
 force-info:\r
 # Note that doc/emacs/makefile knows how to\r
 # put the info files in $(infodir),\r
@@ -323,6 +351,7 @@ top-distclean:
        - $(DEL) stamp_BLD\r
        - $(DEL) ../etc/DOC ../etc/DOC-X\r
        - $(DEL) config.log Makefile\r
+       - $(DEL) ../README.W32\r
 \r
 distclean: distclean-other-dirs-$(MAKETYPE) top-distclean\r
 \r
@@ -388,3 +417,16 @@ maintainer-clean-other-dirs-gmake:
 \r
 realclean: cleanall\r
        - $(DEL_TREE) ../bin\r
+\r
+TAGS: TAGS-$(MAKETYPE)\r
+\r
+frc:\r
+TAGS-gmake: frc\r
+       ../lib-src/$(BLD)/etags $(CURDIR)/*.c\r
+       $(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP\r
+       $(MAKE) $(MFLAGS) -C ../lib-src TAGS\r
+\r
+TAGS-nmake:\r
+       echo This target is not supported with NMake\r
+\r
+.PHONY: frc\r