* 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 81bf6a1e105e27aae504921ee5056e45473317cd..ce3322c8f00abd70ece98a030c0b4c1cb8d5005d 100644 (file)
--- 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 b442ca57b78dcccc08b3f52053aa504570692fad..30a5f83ea000604e8d58f58e7219070460f0fc97 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -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