diff options
| author | Christoph Scholtes <cschol2112@gmail.com> | 2010-07-24 15:35:31 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-07-24 15:35:31 +0200 |
| commit | e3aef5c688f5c4a471f92494c0b2599574140658 (patch) | |
| tree | 91c8c77a8961c818b85b9537e816b0befd996d1f /nt/makefile.w32-in | |
| parent | c4cc8b9a23253c12c5cee0be1363343fe019bf20 (diff) | |
| download | emacs-e3aef5c688f5c4a471f92494c0b2599574140658.tar.gz | |
New make target for Windows platform: make dist (bug#6602)
* admin/admin.el: Write version number to nt/makefile.w32-in.
* admin/nt/makedist.bat: Remove; replaced with `zipdist.bat'
in the nt/ directory.
* admin/nt/README.W32: Relocate to nt/ directory.
* etc/NEWS: Document new --distfiles configure.bat option and
`dist' make target on Windows.
* nt/INSTALL: Document new dist target and add section about
creating binary distributions.
* nt/configure.bat: New parameter `--distfiles'.
* nt/makefile.w32-in: Add version number, new target `dist'.
Add new target `install-shortcuts'.
* nt/zipdist.bat: New file; create zipped binary distribution,
replaces admin/nt/makedist.bat.
Diffstat (limited to 'nt/makefile.w32-in')
| -rw-r--r-- | nt/makefile.w32-in | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 48b3ab14056..47f9b901075 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -23,6 +23,8 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
# (and remove or replace this comment).
+VERSION = 24.0.50
+
TRES = $(BLD)/emacs.res
CLIENTRES = $(BLD)/emacsclient.res
@@ -197,12 +199,15 @@ $(INSTALL_DIR)/bin: $(INSTALL_DIR) #
# Build and install emacs in INSTALL_DIR
#
-install: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
+.PHONY: install-bin install-shortcuts
+
+install: install-bin install-shortcuts
+
+install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
- $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
- $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
- $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
- $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
- - "$(INSTALL_DIR)/bin/addpm" -q
- $(DEL) ../same-dir.tst
- $(DEL) $(INSTALL_DIR)/same-dir.tst
echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
@@ -238,6 +243,14 @@ install-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
+install-shortcuts:
+ "$(INSTALL_DIR)/bin/addpm" -q
+
+dist: install-bin
+ $(CP) $(DIST_FILES) $(INSTALL_DIR)/bin
+ $(CP) README.W32 $(INSTALL_DIR)
+ $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(INSTALL_DIR) $(VERSION)$(ARGQUOTE)
+
force-info:
# Note that doc/emacs/makefile knows how to
# put the info files in $(infodir),
|