diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2007-07-13 20:42:01 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2007-07-13 20:42:01 +0000 |
| commit | 86d925186186ba058663ad42328a42dca07e637f (patch) | |
| tree | d8805e0ee29a3c7c4b35d67ebad3d53db02e876b | |
| parent | 47f88b0058bd7349bfab19d109991a47e08167bf (diff) | |
| download | emacs-86d925186186ba058663ad42328a42dca07e637f.tar.gz | |
(install-lisp-SH, install-lisp-CMD): New targets.
(install): Use them to copy all *.el files before *.elc.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 644636076c3..3fb9fc4cb42 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-07-13 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (install-lisp-SH, install-lisp-CMD): New targets. + (install): Use them to copy all *.el files before *.elc. + 2007-07-13 Dan Nicolaescu <dann@ics.uci.edu> * replace.el (match): Use yellow1 instead of yellow. diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 29b3a185fb5..6e8a3f5d39a 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -408,7 +408,7 @@ install: - $(DEL) "$(INSTALL_DIR)/same-dir.tst" echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst" #ifdef COPY_LISP_SOURCE - $(IFNOTSAMEDIR) $(CP_DIR) . "$(INSTALL_DIR)/lisp" $(ENDIF) + $(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) install-lisp-$(SHELLTYPE) $(ENDIF) #else # $(IFNOTSAMEDIR) $(CP_DIR) *.elc "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) cus-load.el "$(INSTALL_DIR)/lisp" $(ENDIF) @@ -425,6 +425,19 @@ install: - $(DEL) ../same-dir.tst - $(DEL) "$(INSTALL_DIR)/same-dir.tst" +# Need to copy *.el files first, to avoid "source file is newer" annoyance +# since cp does not preserve time stamps +install-lisp-SH: + cp -f *.el "$(INSTALL_DIR)/lisp" + for dir in $(WINS); do mkdir "$(INSTALL_DIR)/lisp/$$dir" && cp -f $$dir/*.el "$(INSTALL_DIR)/lisp/$$dir"; done + for dir in . $(WINS); do cp $$dir/*.elc "$(INSTALL_DIR)/lisp/$$dir"; done + +install-lisp-CMD: + cp -f *.el "$(INSTALL_DIR)/lisp" + for %%f in ($(WINS)) do mkdir "$(INSTALL_DIR)/lisp/%%f" + for %%f in ($(WINS)) do cp -f %%f/*.el "$(INSTALL_DIR)/lisp/%%f" + for %%f in (. $(WINS)) do cp -f %%f/*.elc "$(INSTALL_DIR)/lisp/%%f" + # # Maintenance # |