[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108628: Fix "make dist" on MS-Window
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108628: Fix "make dist" on MS-Windows. |
Date: |
Sat, 16 Jun 2012 16:17:14 +0300 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108628
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-16 16:17:14 +0300
message:
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.
modified:
nt/ChangeLog
nt/makefile.w32-in
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2012-06-11 23:17:11 +0000
+++ b/nt/ChangeLog 2012-06-16 13:17:14 +0000
@@ -1,3 +1,12 @@
+2012-06-16 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* config.nt (SYSTEM_TYPE): Define it.
=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in 2012-06-10 13:20:58 +0000
+++ b/nt/makefile.w32-in 2012-06-16 13:17:14 +0000
@@ -257,8 +257,10 @@
$(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 @@
# 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108628: Fix "make dist" on MS-Windows.,
Eli Zaretskii <=