comparison nt/makefile.w32-in @ 109523:2fe88640ebd3

Build binary distros on Windows using emacs-VERSION as root dir name. * nt/makefile.w32-in: Copy README.W32 to installation directory during `make install'. Remove README.W32 with `distclean' (in case Emacs was installed in place). Use temporary directory to create distribution zip files in `dist' target. * nt/zipdist.bat: Simplify code using temporary directory.
author Juanma Barranquero <lekktu@gmail.com>
date Sun, 25 Jul 2010 05:53:37 +0200
parents 4e03e8c753eb
children 7e4b4d33d1b2
comparison
equal deleted inserted replaced
109517:d22063077a0c 109523:2fe88640ebd3
22 22
23 # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out 23 # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
24 # (and remove or replace this comment). 24 # (and remove or replace this comment).
25 25
26 VERSION = 24.0.50 26 VERSION = 24.0.50
27
28 TMP_DIST_DIR = emacs-$(VERSION)
27 29
28 TRES = $(BLD)/emacs.res 30 TRES = $(BLD)/emacs.res
29 CLIENTRES = $(BLD)/emacsclient.res 31 CLIENTRES = $(BLD)/emacsclient.res
30 32
31 XMFLAGS = 33 XMFLAGS =
206 install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE) 208 install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
207 - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin 209 - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
208 - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin 210 - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
209 - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin 211 - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
210 - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin 212 - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
213 - $(CP) README.W32 $(INSTALL_DIR)
211 - $(DEL) ../same-dir.tst 214 - $(DEL) ../same-dir.tst
212 - $(DEL) $(INSTALL_DIR)/same-dir.tst 215 - $(DEL) $(INSTALL_DIR)/same-dir.tst
213 echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst" 216 echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
214 - mkdir "$(INSTALL_DIR)/etc" 217 - mkdir "$(INSTALL_DIR)/etc"
215 - mkdir "$(INSTALL_DIR)/info" 218 - mkdir "$(INSTALL_DIR)/info"
244 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install 247 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
245 248
246 install-shortcuts: 249 install-shortcuts:
247 "$(INSTALL_DIR)/bin/addpm" -q 250 "$(INSTALL_DIR)/bin/addpm" -q
248 251
249 dist: install-bin 252 dist: install-bin
250 $(CP) $(DIST_FILES) $(INSTALL_DIR)/bin 253 mkdir $(TMP_DIST_DIR)
251 $(CP) README.W32 $(INSTALL_DIR) 254 $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)
252 $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(INSTALL_DIR) $(VERSION)$(ARGQUOTE) 255 $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)
256 $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)
257 $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR)
258 $(CP) "$(INSTALL_DIR)/INSTALL" $(TMP_DIST_DIR)
259 $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR)
260 $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR)
261 $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR)
262 $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR)
263 $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR)
264 $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR)
265 $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
266 $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE)
267 $(DEL_TREE) $(TMP_DIST_DIR)
253 268
254 force-info: 269 force-info:
255 # Note that doc/emacs/makefile knows how to 270 # Note that doc/emacs/makefile knows how to
256 # put the info files in $(infodir), 271 # put the info files in $(infodir),
257 # so we can do ok running make in the build dir. 272 # so we can do ok running make in the build dir.
334 - $(DEL_TREE) oo 349 - $(DEL_TREE) oo
335 - $(DEL_TREE) oo-spd 350 - $(DEL_TREE) oo-spd
336 - $(DEL) stamp_BLD 351 - $(DEL) stamp_BLD
337 - $(DEL) ../etc/DOC ../etc/DOC-X 352 - $(DEL) ../etc/DOC ../etc/DOC-X
338 - $(DEL) config.log Makefile 353 - $(DEL) config.log Makefile
354 - $(DEL) ../README.W32
339 355
340 distclean: distclean-other-dirs-$(MAKETYPE) top-distclean 356 distclean: distclean-other-dirs-$(MAKETYPE) top-distclean
341 357
342 distclean-other-dirs-nmake: 358 distclean-other-dirs-nmake:
343 cd ..\lib-src 359 cd ..\lib-src