From c1d68766e1ad6341508c7137851d011fba6b6789 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 12 Sep 1998 04:44:46 +0000 Subject: [PATCH] Hopefully the last of the great install fixes. --- servers/slapd/Make-template | 11 +++-- servers/slapd/tools/Make-template | 3 -- servers/slurpd/Make-template | 74 ++----------------------------- 3 files changed, 9 insertions(+), 79 deletions(-) diff --git a/servers/slapd/Make-template b/servers/slapd/Make-template index 302232a5d2..5ae9320946 100644 --- a/servers/slapd/Make-template +++ b/servers/slapd/Make-template @@ -106,30 +106,29 @@ install: all $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slapd \ $(LDAP_ETCDIR)/slapd.at.conf $(LDAP_ETCDIR)/slapd.oc.conf \ install-tools -$(LDAP_LIBEXECDIR): FORCE - @-$(MKDIR) $(LDAP_LIBEXECDIR) - -$(LDAP_ETCDIR): FORCE - @-$(MKDIR) $(LDAP_ETCDIR) - $(LDAP_LIBEXECDIR)/slapd: slapd + @-$(MKDIR) -p $(LDAP_LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(LDAP_LIBEXECDIR) $(LDAP_ETCDIR)/slapd.conf: slapd.conf + @-$(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) -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) -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 a853719a69..b5c3c17d3e 100644 --- a/servers/slapd/tools/Make-template +++ b/servers/slapd/tools/Make-template @@ -109,9 +109,6 @@ install: $(LDAP_SBINDIR) $(LDAP_SBINDIR)/edb2ldif $(LDAP_SBINDIR)/ldif2ldbm \ $(LDAP_SBINDIR)/centipede $(LDAP_SBINDIR)/ldbmtest \ $(LDAP_SBINDIR)/ldif -$(LDAP_SBINDIR): FORCE - @-$(MKDIR) $(LDAP_SBINDIR) - $(LDAP_SBINDIR)/edb2ldif: build-edb2ldif @if [ "$(HAVEISODE)" = "yes" ]; then \ $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(LDAP_SBINDIR); \ diff --git a/servers/slurpd/Make-template b/servers/slurpd/Make-template index a43494093d..e46998241b 100644 --- a/servers/slurpd/Make-template +++ b/servers/slurpd/Make-template @@ -56,10 +56,11 @@ version.c: $(OBJS) $(LDIR)/liblber/liblber.a $(LDIR)/libldap/libldap.a -e "s|%VERSION%|$${v}|" \ < Version.c > $@) -install: $(ETCDIR) $(ETCDIR)/slurpd +install: $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slurpd -$(ETCDIR)/slurpd: slurpd - $(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(ETCDIR) +$(LDAP_LIBEXECDIR)/slurpd: slurpd + @-$(MKDIR) -p $(LDAP_LIBEXECDIR) + $(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(LDAP_LIBEXECDIR) lint: FORCE $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) @@ -78,70 +79,3 @@ links: @echo "making links in `$(PWD)`" @$(LN) .src/*.[ch] . -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -admin.o: admin.c slurp.h ../../include/lber.h ../../include/ldap.h -admin.o: ../../include/lthread.h ../../include/portable.h -admin.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -args.o: args.c ../../include/lber.h ../../include/ldap.h slurp.h -args.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -args.o: ../../include/portable.h ../../include/ldapconfig.h -args.o: ../../include/ldif.h globals.h slurp.h -ch_malloc.o: ch_malloc.c ../slapd/slap.h ../../include/avl.h -ch_malloc.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -ch_malloc.o: ../../include/ldif.h -config.o: config.c ../../include/lber.h ../../include/ldap.h slurp.h -config.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -config.o: ../../include/portable.h ../../include/ldapconfig.h -config.o: ../../include/ldif.h globals.h slurp.h -detach.o: detach.c ../../include/portable.h -fm.o: fm.c slurp.h ../../include/lber.h ../../include/ldap.h -fm.o: ../../include/lthread.h ../../include/portable.h -fm.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -globals.o: globals.c slurp.h ../../include/lber.h ../../include/ldap.h -globals.o: ../../include/lthread.h ../../include/portable.h -globals.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -ldap_op.o: ldap_op.c ../../include/lber.h ../../include/ldap.h -ldap_op.o: ../../include/portable.h slurp.h ../../include/lber.h -ldap_op.o: ../../include/ldap.h ../../include/lthread.h -ldap_op.o: ../../include/portable.h ../../include/ldapconfig.h -ldap_op.o: ../../include/ldif.h -lock.o: lock.c ../../include/portable.h ../slapd/slap.h ../../include/avl.h -lock.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -lock.o: ../../include/ldif.h -main.o: main.c slurp.h ../../include/lber.h ../../include/ldap.h -main.o: ../../include/lthread.h ../../include/portable.h -main.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -re.o: re.c ../slapd/slap.h ../../include/avl.h ../../include/lber.h -re.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h slurp.h -re.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -re.o: ../../include/portable.h ../../include/ldapconfig.h ../../include/ldif.h -re.o: globals.h slurp.h -reject.o: reject.c slurp.h ../../include/lber.h ../../include/ldap.h -reject.o: ../../include/lthread.h ../../include/portable.h -reject.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -replica.o: replica.c slurp.h ../../include/lber.h ../../include/ldap.h -replica.o: ../../include/lthread.h ../../include/portable.h -replica.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -replog.o: replog.c ../../include/portable.h slurp.h ../../include/lber.h -replog.o: ../../include/ldap.h ../../include/lthread.h ../../include/portable.h -replog.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -ri.o: ri.c slurp.h ../../include/lber.h ../../include/ldap.h -ri.o: ../../include/lthread.h ../../include/portable.h -ri.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -rq.o: rq.c slurp.h ../../include/lber.h ../../include/ldap.h -rq.o: ../../include/lthread.h ../../include/portable.h -rq.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -sanity.o: sanity.c slurp.h ../../include/lber.h ../../include/ldap.h -sanity.o: ../../include/lthread.h ../../include/portable.h -sanity.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -sanity.o: ../../include/portable.h -st.o: st.c slurp.h ../../include/lber.h ../../include/ldap.h -st.o: ../../include/lthread.h ../../include/portable.h -st.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -tsleep.o: tsleep.c slurp.h ../../include/lber.h ../../include/ldap.h -tsleep.o: ../../include/lthread.h ../../include/portable.h -tsleep.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY -- 2.39.5