From: Eli Zaretskii Date: Fri, 20 Jul 2007 19:27:27 +0000 (+0000) Subject: (install-lisp-SH, install-lisp-CMD): New targets. X-Git-Tag: emacs-pretest-22.1.90~1237 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4fe7e5e9515ca3bf38acdbc86f4449a23535186;p=emacs.git (install-lisp-SH, install-lisp-CMD): New targets. (install): Use them to copy all *.el files before *.elc. (clean): Don't delete *~. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 74984f03789..b6a9389a734 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-07-20 Eli Zaretskii + + * makefile.w32-in (install-lisp-SH, install-lisp-CMD): New targets. + (install): Use them to copy all *.el files before *.elc. + (clean): Don't delete *~. + 2007-07-20 Dan Nicolaescu * vc-hg.el (vc-hg-workfile-unchanged-p): New function. diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 6e8a3f5d39a..55b9f9ed5e2 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -429,17 +429,20 @@ install: # 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 [ -d "$(INSTALL_DIR)/lisp/$$dir" ] || mkdir "$(INSTALL_DIR)/lisp/$$dir"; done + for dir in $(WINS); do 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 if not exist "$(INSTALL_DIR)/lisp/%%f" 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 # +# We used to delete *~ here, but that might inadvertently remove +# precious files if it happens to match their short 8+3 aliases. clean: - - $(DEL) *~ + - $(DEL) *.el~