[Emacs-diffs] /srv/bzr/emacs/trunk r107121: * nt/makefile.w32-in (maybe-copy-distfiles)

[Christoph Scholtes]

------------------------------------------------------------
revno: 107121
committer: Christoph Scholtes <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-05 13:14:54 -0700
message:
  * 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.
modified:
  nt/ChangeLog
  nt/makefile.w32-in

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-02-04 13:24:07 +0000
+++ b/nt/ChangeLog      2012-02-05 20:14:54 +0000
@@ -1,3 +1,10 @@
+2012-02-05  Christoph Scholtes  <address@hidden>
+
+       * 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  <address@hidden>
 
        * inc/sys/stat.h (_STAT_DEFINED): Define, to prevent redefinitions

=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in        2012-01-29 15:46:05 +0000
+++ b/nt/makefile.w32-in        2012-02-05 20:14:54 +0000
@@ -257,8 +257,22 @@
 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 @@
        $(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)