Okay, this really works.

diff --git a/servers/slapd/Make-template b/servers/slapd/Make-template
index 0f476efcfbf2d31b851d84edfe96be6118658b66..9ce0c6cf1cd398a52882fe0f99f44fbdf0d84c76 100644 (file)
--- a/servers/slapd/Make-template
+++ b/servers/slapd/Make-template
@@ -108,27 +108,28 @@ install: all $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slapd \
 
 
 $(LDAP_LIBEXECDIR)/slapd:      slapd
-       @$(MKDIR) $(LDAP_LIBEXECDIR)
+       @-$(MKDIR) -p $(LDAP_LIBEXECDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(LDAP_LIBEXECDIR)
 
 $(LDAP_ETCDIR)/slapd.conf:     slapd.conf
-       @-$(MKDIR) $(LDAP_ETCDIR)
+       @-$(MKDIR) -p $(LDAP_ETCDIR)
        $(SED) -e 's;%ETCDIR%;$(LDAP_ETCDIR);' slapd.conf > /tmp/slapd.$$
        -$(MV) $(LDAP_ETCDIR)/slapd.conf $(LDAP_ETCDIR)/slapd.conf-
        $(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(LDAP_ETCDIR)/slapd.conf
        $(RM) -f /tmp/slapd.$$
 
 $(LDAP_ETCDIR)/slapd.at.conf:  slapd.at.conf
-       @-$(MKDIR) $(LDAP_ETCDIR)
+       @-$(MKDIR) -p $(LDAP_ETCDIR)
        -$(MV) $(LDAP_ETCDIR)/slapd.at.conf $(LDAP_ETCDIR)/slapd.at.conf-
        $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(LDAP_ETCDIR)
 
 $(LDAP_ETCDIR)/slapd.oc.conf:  slapd.oc.conf
-       @-$(MKDIR) $(LDAP_ETCDIR)
+       @-$(MKDIR) -p $(LDAP_ETCDIR)
        -$(MV) $(LDAP_ETCDIR)/slapd.oc.conf $(LDAP_ETCDIR)/slapd.oc.conf-
        $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(LDAP_ETCDIR)
 
 install-tools: FORCE
+       @-$(MKDIR) -p $(LDAP_SBINDIR)
        (cd tools; $(MAKE) $(MFLAGS) install)
 
 lint:  FORCE

diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template
index 0bcdc5412f6ad3716bc254a98b97fc697775362e..7464e9aa21e2ffb4942188049853be0bb9166f88 100644 (file)
--- a/servers/slapd/tools/Make-template
+++ b/servers/slapd/tools/Make-template
@@ -109,11 +109,8 @@ install: $(LDAP_SBINDIR) $(LDAP_SBINDIR)/edb2ldif $(LDAP_SBINDIR)/ldif2ldbm \
        $(LDAP_SBINDIR)/centipede $(LDAP_SBINDIR)/ldbmtest \
        $(LDAP_SBINDIR)/ldif
 
-$(LDAP_SBINDIR): FORCE
-
 $(LDAP_SBINDIR)/edb2ldif:      build-edb2ldif
        @if [ "$(HAVEISODE)" = "yes" ]; then \
-               @$(MKDIR) $(LDAP_SBINDIR); \
                $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(LDAP_SBINDIR); \
        else \
                exit 0; \
@@ -121,42 +118,33 @@ $(LDAP_SBINDIR)/edb2ldif: build-edb2ldif
 
 $(LDAP_SBINDIR)/chlog2replog:  build-chlog2replog
        @if [ "$(HAVEISODE)" = "yes" ]; then \
-               @$(MKDIR) $(LDAP_SBINDIR); \
                $(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(LDAP_SBINDIR); \
        else \
                exit 0; \
        fi
 
 $(LDAP_SBINDIR)/ldif2ldbm:     ldif2ldbm
-       @$(MKDIR) $(LDAP_SBINDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(LDAP_SBINDIR)
 
 $(LDAP_SBINDIR)/ldif2index:    ldif2index
-       @$(MKDIR) $(LDAP_SBINDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(LDAP_SBINDIR)
 
 $(LDAP_SBINDIR)/ldif2id2entry: ldif2id2entry
-       @$(MKDIR) $(LDAP_SBINDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(LDAP_SBINDIR)
 
 $(LDAP_SBINDIR)/ldif2id2children:      ldif2id2children
-       @$(MKDIR) $(LDAP_SBINDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(LDAP_SBINDIR)
 
 $(LDAP_SBINDIR)/ldbmcat:       ldbmcat
-       @$(MKDIR) $(LDAP_SBINDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(LDAP_SBINDIR)
 
 $(LDAP_SBINDIR)/ldif:  ldif
-       @$(MKDIR) $(LDAP_SBINDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(LDAP_SBINDIR)
 
 $(LDAP_SBINDIR)/centipede:     centipede
-       @$(MKDIR) $(LDAP_SBINDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(LDAP_SBINDIR)
 
 $(LDAP_SBINDIR)/ldbmtest:      ldbmtest
-       @$(MKDIR) $(LDAP_SBINDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(LDAP_SBINDIR)
 
 lint:  FORCE

diff --git a/servers/slurpd/Make-template b/servers/slurpd/Make-template
index bbd4ec18fd692bc651e13ea71807143db4d8f6ec..91734c51bbf25b51a9621c42d9bcce3956745ccd 100644 (file)
--- a/servers/slurpd/Make-template
+++ b/servers/slurpd/Make-template
@@ -59,7 +59,7 @@ version.c: $(OBJS) $(LDIR)/liblber/liblber.a $(LDIR)/libldap/libldap.a
 install: $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slurpd
 
 $(LDAP_LIBEXECDIR)/slurpd:     slurpd
-       @-$(MKDIR) $(LDAP_LIBEXECDIR)
+       @-$(MKDIR) -p $(LDAP_LIBEXECDIR)
        $(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(LDAP_LIBEXECDIR)
 
 lint:  FORCE