make install on existing emacs fails

[dhruva]

Hi,
I am building CVS HEAD Emacs on WXP using MinGW. The "make install"
fails to install emacs on an existing installed folder.

------------ build o/p ------------
cp -f *.el "e:/GNU/emacs/lisp"
for %%f in (calc calendar emacs-lisp emulation erc eshell gnus
international language mail mh-e net play progmodes term textmodes url
obsolete) do mkdir "e:/GNU/emacs/lisp/%%f"
A subdirectory or file e:/GNU/emacs/lisp/calc already exists.
A subdirectory or file e:/GNU/emacs/lisp/calendar already exists.
A subdirectory or file e:/GNU/emacs/lisp/emacs-lisp already exists.
A subdirectory or file e:/GNU/emacs/lisp/emulation already exists.
[... snip...]
A subdirectory or file e:/GNU/emacs/lisp/obsolete already exists.
make[2]: *** [install-lisp-CMD] Error 1
make[2]: Leaving directory `E:/cache/build/emacs/lisp'
make[1]: *** [install] Error 2
make[1]: Leaving directory `E:/cache/build/emacs/lisp'
make: *** [install-other-dirs-gmake] Error 2
---------- build o/p ---------------

The following patch fixes this issue:

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -434,7 +434,7 @@ install-lisp-SH:

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"


-dky
.
--
Dhruva Krishnamurthy
Contents reflect my personal views only!