diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-06-16 16:17:14 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-06-16 16:17:14 +0300 |
| commit | 6eb93f60be979b75f803df4963f69c09702f2225 (patch) | |
| tree | a3852fb5ee86bcd5efb53e0eeb97ab8ac46d13e7 /nt/makefile.w32-in | |
| parent | e5560ff7d28c684003ed598a9390e17f9fb92d34 (diff) | |
| download | emacs-6eb93f60be979b75f803df4963f69c09702f2225.tar.gz | |
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.
Diffstat (limited to 'nt/makefile.w32-in')
| -rw-r--r-- | nt/makefile.w32-in | 6 |
1 files changed, 4 insertions, 2 deletions
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) |