From: Eli Zaretskii Date: Sat, 16 Jun 2012 13:17:14 +0000 (+0300) Subject: Fix "make dist" on MS-Windows. X-Git-Tag: emacs-24.2.90~1199^2~459 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6eb93f60be979b75f803df4963f69c09702f2225;p=emacs.git Fix "make dist" on MS-Windows. 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. --- diff --git a/nt/ChangeLog b/nt/ChangeLog index a103c8b1c2c..cc5fda97755 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,12 @@ +2012-06-16 Eli Zaretskii + + * 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 * config.nt (SYSTEM_TYPE): Define it. diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 3ddf3a04cb6..274ce7e5271 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -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)