X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=059c8f2b18d4cee9858724b37c686d72cad7e3f0;hb=92507af85cd3a9ae5cbb23074928734d643b3f70;hp=9aaa5c447a98ec352c0a612afefe2049a1c61512;hpb=001b9cb904f75db81463cd11b1875bbfbfbb17ba;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 9aaa5c447a..059c8f2b18 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -25,7 +25,7 @@ LDAP_LIBDIR= ../../libraries
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
-all-local: FORCE
+all-local-srv: FORCE
 	$(MAKE) $(MFLAGS) backendslib
 	$(MAKE) $(MFLAGS) slapd
 	(cd tools; $(MAKE) $(MFLAGS) all)
@@ -86,7 +86,7 @@ version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
 	-e "s|%VERSION%|$${v}|" \
 	< $(srcdir)/Version.c > $@)
 
-depend-local: FORCE
+depend-local-srv: FORCE
 	@for i in back-* shell-backends tools; do \
 		if [ -d $$i ]; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
@@ -94,7 +94,7 @@ depend-local: FORCE
 		fi; \
 	done
 
-clean-local: FORCE
+clean-local-srv: FORCE
 	@for i in back-* shell-backends tools; do \
 		if [ -d $$i ]; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
@@ -102,30 +102,29 @@ clean-local: FORCE
 		fi; \
 	done
 
-veryclean-local: FORCE
-	@for i in back-* shell-backends tools; do \
-		if [ -d $$i ]; then \
-			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) veryclean"; \
-			( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
-		fi; \
-	done
-
-install-local: install-slapd install-conf install-tools
+install-local-srv: install-slapd install-conf install-tools
 
 install-slapd: FORCE
 	@-$(MKDIR) $(libexecdir)
 	$(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir)
 
+CFFILES=slapd.conf slapd.at.conf slapd.oc.conf
+
 install-conf: FORCE
-	@-$(MKDIR) -p $(sysconfdir)
-	$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' slapd.conf > /tmp/slapd.$$
-	-$(MV) $(sysconfdir)/slapd.conf $(sysconfdir)/slapd.conf-
-	$(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(sysconfdir)/slapd.conf
-	$(RM) -f /tmp/slapd.$$
-	-$(MV) $(sysconfdir)/slapd.at.conf $(sysconfdir)/slapd.at.conf-
-	$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(sysconfdir)
-	-$(MV) $(sysconfdir)/slapd.oc.conf $(sysconfdir)/slapd.oc.conf-
-	$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(sysconfdir)
+	@-$(MKDIR) $(sysconfdir)
+	@for i in $(CFFILES); do \
+		tmpcf=/tmp/$$i.$$ ; \
+		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $$i > $$tmpcf ; \
+		if test ! -f $(sysconfdir)/$$i; then \
+			echo "installing $$i in $(sysconfdir)"; \
+			echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i"; \
+			$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i; \
+		else \
+			echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
+		fi; \
+		$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i.default; \
+		$(RM) -f /tmp/slapd.$$ ; \
+	done
 
 install-tools: FORCE
 	@-$(MKDIR) $(sbindir)