From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 20 Jul 2007 11:15:09 +0000 (+0000)
Subject: (install-lisp-CMD, install-lisp-SH): Don't create subdirectories
X-Git-Tag: emacs-pretest-23.0.90~11819
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec9bbc6ce57f8ff72d56c8c2455347ea9634b72f;p=emacs.git

(install-lisp-CMD, install-lisp-SH): Don't create subdirectories
in $(INSTALL_DIR)/lisp/ if they already exist.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b167d2cc88..dfd8e484168 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (install-lisp-SH): Don't create subdirectories
+	in $(INSTALL_DIR)/lisp/ if they already exist.
+
+2007-07-20  Dhruva Krishnamurthy  <dhruvakm@gmail.com>  (tiny change)
+
+	* makefile.w32-in (install-lisp-CMD): Don't create subdirectories
+	in $(INSTALL_DIR)/lisp/ if they already exist.
+
 2007-07-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/vera-mode.el (vera-re-search-forward)
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 0b666d941e5..55b9f9ed5e2 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -429,12 +429,13 @@ 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"