From: Christoph Scholtes <cschol2112@gmail.com>
Date: Sun, 5 Feb 2012 20:14:54 +0000 (-0700)
Subject: * nt/makefile.w32-in (maybe-copy-distfiles)
X-Git-Tag: emacs-pretest-24.0.94~300
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d452256dd8168b502a22a4af6c6409d7aebc51bd;p=emacs.git

* nt/makefile.w32-in (maybe-copy-distfiles)
(maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH)
(create-tmp-dist-dir): Added to make --distfiles optional.
(dist): Use create-tmp-dist-dir and maybe-copy-distfiles.
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 81bf6a1e105..ce3322c8f00 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-05  Christoph Scholtes  <cschol2112@googlemail.com>
+
+	* makefile.w32-in (maybe-copy-distfiles)
+	(maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH)
+	(create-tmp-dist-dir): Added to make --distfiles optional.
+	(dist): Use create-tmp-dist-dir and maybe-copy-distfiles.
+
 2012-02-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* inc/sys/stat.h (_STAT_DEFINED): Define, to prevent redefinitions
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index b442ca57b78..30a5f83ea00 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -257,8 +257,22 @@ install-other-dirs-gmake:
 install-shortcuts:
 	"$(INSTALL_DIR)/bin/addpm" -q
 
-dist: install-bin
-	mkdir $(TMP_DIST_DIR)
+maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE)
+
+maybe-copy-distfiles-CMD: doit
+	@if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
+
+maybe-copy-distfiles-SH: doit
+	@if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \
+	  $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
+	fi
+
+create-tmp-dist-dir:
+	mkdir "$(TMP_DIST_DIR)"
+# Also create bin directory for dist files.
+	mkdir "$(TMP_DIST_DIR)/bin"
+
+dist: install-bin create-tmp-dist-dir maybe-copy-distfiles
 	$(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)
 	$(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)
 	$(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)
@@ -269,7 +283,6 @@ dist: install-bin
 	$(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR)
 	$(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR)
 	$(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR)
-	$(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
 	$(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE)
 	$(DEL_TREE) $(TMP_DIST_DIR)