[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/makefile.w32-in, v [EMACS_22_BASE]
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/makefile.w32-in, v [EMACS_22_BASE] |
Date: |
Fri, 13 Jul 2007 20:41:18 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Eli Zaretskii <eliz> 07/07/13 20:41:17
Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/makefile.w32-in,v
retrieving revision 1.64.2.1
retrieving revision 1.64.2.2
diff -u -b -r1.64.2.1 -r1.64.2.2
--- makefile.w32-in 28 Apr 2007 09:33:34 -0000 1.64.2.1
+++ makefile.w32-in 13 Jul 2007 20:41:17 -0000 1.64.2.2
@@ -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
#
- [Emacs-diffs] Changes to emacs/lisp/makefile.w32-in, v [EMACS_22_BASE],
Eli Zaretskii <=