Commit 564a3032 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(install-lisp-SH, install-lisp-CMD): New targets.

(install): Use them to copy all *.el files before *.elc.
parent 3fc75039
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 Karl Fogel <kfogel@red-bean.com> 2007-07-13 Karl Fogel <kfogel@red-bean.com>
* bookmark.el (bookmark-jump-other-window): New function. * bookmark.el (bookmark-jump-other-window): New function.
......
...@@ -408,7 +408,7 @@ install: ...@@ -408,7 +408,7 @@ install:
- $(DEL) "$(INSTALL_DIR)/same-dir.tst" - $(DEL) "$(INSTALL_DIR)/same-dir.tst"
echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst" echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
#ifdef COPY_LISP_SOURCE #ifdef COPY_LISP_SOURCE
$(IFNOTSAMEDIR) $(CP_DIR) . "$(INSTALL_DIR)/lisp" $(ENDIF) $(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) install-lisp-$(SHELLTYPE) $(ENDIF)
#else #else
# $(IFNOTSAMEDIR) $(CP_DIR) *.elc "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP_DIR) *.elc "$(INSTALL_DIR)/lisp" $(ENDIF)
# $(IFNOTSAMEDIR) $(CP) cus-load.el "$(INSTALL_DIR)/lisp" $(ENDIF) # $(IFNOTSAMEDIR) $(CP) cus-load.el "$(INSTALL_DIR)/lisp" $(ENDIF)
...@@ -425,6 +425,19 @@ install: ...@@ -425,6 +425,19 @@ install:
- $(DEL) ../same-dir.tst - $(DEL) ../same-dir.tst
- $(DEL) "$(INSTALL_DIR)/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 # Maintenance
# #
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment