Replace mkinstalldirs with mkdir -p.

Check for MIKDIR_P and use it instead of mkinstalldirs.  Should fix "mkdir:
cannot create directory:... File exists" during "make install".
Patch from eb at emlix.com.

1 files changed, 6 insertions, 5 deletions

diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile
index a0261f48d..4b78cd950 100644
--- a/contrib/cygwin/Makefile
+++ b/contrib/cygwin/Makefile
@@ -13,6 +13,7 @@ defaultsdir=$(sysconfdir)/defaults/etc
 inetdefdir=$(defaultsdir)/inetd.d
 PRIVSEP_PATH=/var/empty
 INSTALL=/usr/bin/install -c
+MKDIR_P=$(srcdir)/mkinstalldirs
 
 DESTDIR=
 
@@ -23,7 +24,7 @@ all:
         @echo
 
 move-config-files: $(DESTDIR)$(sysconfdir)/ssh_config $(DESTDIR)$(sysconfdir)/sshd_config
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(defaultsdir)
+        $(MKDIR_P) $(DESTDIR)$(defaultsdir)
         mv $(DESTDIR)$(sysconfdir)/ssh_config $(DESTDIR)$(defaultsdir)
         mv $(DESTDIR)$(sysconfdir)/sshd_config $(DESTDIR)$(defaultsdir)
 
@@ -31,11 +32,11 @@ remove-empty-dir:
         rm -rf $(DESTDIR)$(PRIVSEP_PATH)
 
 install-inetd-config:
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(inetdefdir)
+        $(MKDIR_P) $(DESTDIR)$(inetdefdir)
         $(INSTALL) -m 644 sshd-inetd  $(DESTDIR)$(inetdefdir)/sshd-inetd
 
 install-sshdoc:
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(sshdocdir)
+        $(MKDIR_P) $(DESTDIR)$(sshdocdir)
         -$(INSTALL) -m 644 $(srcdir)/CREDITS $(DESTDIR)$(sshdocdir)/CREDITS
         -$(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog
         -$(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE
@@ -52,13 +53,13 @@ install-sshdoc:
         -$(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO
 
 install-cygwindoc: README
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(cygdocdir)
+        $(MKDIR_P) $(DESTDIR)$(cygdocdir)
         $(INSTALL) -m 644 README $(DESTDIR)$(cygdocdir)/openssh.README
 
 install-doc: install-sshdoc install-cygwindoc
 
 install-scripts: ssh-host-config ssh-user-config
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+        $(MKDIR_P) $(DESTDIR)$(bindir)
         $(INSTALL) -m 755 ssh-host-config $(DESTDIR)$(bindir)/ssh-host-config
         $(INSTALL) -m 755 ssh-user-config $(DESTDIR)$(bindir)/ssh-user-config