procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nt/makefile.w32-in (maybe-copy-distfiles)

Browse source 
(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.
This commit is contained in:
Christoph Scholtes 2012-02-05 13:14:54 -07:00
parent 983b960204
commit d452256dd8
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nt/ChangeLog
View file

@ -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

19
nt/makefile.w32-in
View file

@ -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)