# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1184358162 0
# Node ID a87c36ea2f6241b3bb68a020a2c55f31e61e4fe6
# Parent  04c37649e382f4351659e9634395a33abb4d67b9
(install-lisp-SH, install-lisp-CMD): New targets.
(install): Use them to copy all *.el files before *.elc.

diff -r 04c37649e382 -r a87c36ea2f62 lisp/makefile.w32-in
--- a/lisp/makefile.w32-in	Fri Jul 13 19:47:02 2007 +0000
+++ b/lisp/makefile.w32-in	Fri Jul 13 20:22:42 2007 +0000
@@ -408,7 +408,7 @@
 		- $(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 @@
 		- $(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
 #