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

Fix "make dist" on MS-Windows.

Browse source 
nt/makefile.w32-in (install-addpm): New target.
 (dist): Depend on it.
 (install-shortcuts): Depend on install-addpm instead of copying
 addpm.exe as part of the recipe.  See
 http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00171.html
 for the related problem and discussions.
This commit is contained in:
Eli Zaretskii 2012-06-16 16:17:14 +03:00
parent e5560ff7d2
commit 6eb93f60be
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nt/ChangeLog
View file

@ -1,3 +1,12 @@
2012-06-16 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (install-addpm): New target.
(dist): Depend on it.
(install-shortcuts): Depend on install-addpm instead of copying
addpm.exe as part of the recipe. See
http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00171.html
for the related problem and discussions.
2012-06-11 Glenn Morris <rgm@gnu.org>
* config.nt (SYSTEM_TYPE): Define it.

6
nt/makefile.w32-in
View file

@ -257,8 +257,10 @@ install-other-dirs-gmake: all
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
install-shortcuts: $(INSTALL_DIR)/bin
install-addpm: $(INSTALL_DIR)/bin addpm
- $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
install-shortcuts: install-addpm
"$(INSTALL_DIR)/bin/addpm" -q
maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE)
@ -276,7 +278,7 @@ create-tmp-dist-dir:
# Also create bin directory for dist files.
mkdir "$(TMP_DIST_DIR)/bin"
dist: install-bin maybe-copy-distfiles
dist: install-bin install-addpm maybe-copy-distfiles
$(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)
$(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)
$(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)