(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 1b167d2cc88b2b9cb72a2c82ade8342a458c46c3..dfd8e484168972ed3096a3bcf8657c0bb37bab11 100644 (file)
--- 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 0b666d941e5a1ad10f5a1e0b609fef1f1ced895c..55b9f9ed5e2c2a565601502018509db94c33847f 100644 (file)
--- 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"