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 a103c8b1c2c6891e116d5f29f285bb3759b3c9c7..cc5fda97755b48212f0c3576ed1005b5282ba0c8 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -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.

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 3ddf3a04cb613225b7dd196a49d09d3cce1ebbd5..274ce7e527199c6696b203a394af9ad5204a2e20 100644 (file)
--- 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)