Merge from emacs-23; up to 2010-06-29T18:17:31Z!cyd@stupidchicken.com.

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

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 194f0759bbf3181411e5853ff98def49f52ab538..30a5f83ea000604e8d58f58e7219070460f0fc97 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.\r
-# Copyright (C) 2000-2011 Free Software Foundation, Inc.\r
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.\r
 #\r
 # Top level makefile for building GNU Emacs on Windows NT\r
 #\r
@@ -22,7 +22,7 @@
 # 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.91\r
+VERSION                = 24.0.93\r
 \r
 TMP_DIST_DIR   = emacs-$(VERSION)\r
 \r
@@ -257,8 +257,22 @@ install-other-dirs-gmake:
 install-shortcuts:\r
        "$(INSTALL_DIR)/bin/addpm" -q\r
 \r
-dist: install-bin\r
-       mkdir $(TMP_DIST_DIR)\r
+maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE)\r
+\r
+maybe-copy-distfiles-CMD: doit\r
+       @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin\r
+\r
+maybe-copy-distfiles-SH: doit\r
+       @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \\r
+         $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin\r
+       fi\r
+\r
+create-tmp-dist-dir:\r
+       mkdir "$(TMP_DIST_DIR)"\r
+# Also create bin directory for dist files.\r
+       mkdir "$(TMP_DIST_DIR)/bin"\r
+\r
+dist: install-bin create-tmp-dist-dir maybe-copy-distfiles\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
@@ -269,7 +283,6 @@ dist: install-bin
        $(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