From: Julio Sánchez Fernández <jsanchez@openldap.org>
Date: Thu, 18 Mar 1999 20:36:42 +0000 (+0000)
Subject: slapd.conf and friends were being modified during the install step
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~354
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=94b8e0830e61a29c382c59d34f8049362b89ad73;p=openldap

slapd.conf and friends were being modified during the install step
---

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 82d2ab373e..b1e51d9624 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -35,6 +35,7 @@ all-local-srv: FORCE
 	$(MAKE) $(MFLAGS) backendslib
 	$(MAKE) $(MFLAGS) slapd
 	(cd tools; $(MAKE) $(MFLAGS) all)
+	$(MAKE) $(MFLAGS) all-cffiles
 
 slapd: version.o
 	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
@@ -98,6 +99,7 @@ clean-local-srv: FORCE
 			( cd $$i; $(MAKE) $(MFLAGS) clean ); \
 		fi; \
 	done
+	rm -f *.tmp all-cffiles
 
 veryclean-local-srv: FORCE
 	@for i in back-* shell-backends tools; do \
@@ -116,18 +118,24 @@ install-slapd: FORCE
 
 CFFILES=slapd.conf slapd.at.conf slapd.oc.conf
 
+all-cffiles:
+	@for i in $(CFFILES); do \
+		tmpcf=$$i.tmp; \
+		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \
+			-e 's;%LOCALSTATEDIR%;$(localstatedir);' \
+			$(srcdir)/$$i > $$tmpcf ; \
+	done
+	touch all-cffiles
+
 install-conf: FORCE
 	@-$(MKDIR) $(sysconfdir)
 	@for i in $(CFFILES); do \
-		tmpcf=/tmp/$$i.$$ ; \
+		tmpcf=$$i.tmp ; \
 		if test $$i = slapd.conf ; then \
 			mode=600 ; \
 		else \
 			mode=644 ; \
 		fi ; \
-		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \
-			-e 's;%LOCALSTATEDIR%;$(localstatedir);' \
-			$(srcdir)/$$i > $$tmpcf ; \
 		if test ! -f $(sysconfdir)/$$i; then \
 			echo "installing $$i in $(sysconfdir)"; \
 			echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i"; \
@@ -136,7 +144,6 @@ install-conf: FORCE
 			echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
 		fi; \
 		$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i.default ; \
-		$(RM) -f $$tmpcf ; \
 	done
 
 install-tools: FORCE