From 73db6bd87575dcf7c638c526af0ef3a0ec774288 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 6 Jun 2000 20:21:56 +0000 Subject: [PATCH] Cleanup slapd.conf sed'ing --- servers/slapd/Makefile.in | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index 32619ea6ba..e8060b37b6 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -239,13 +239,11 @@ install-slapd: FORCE done; \ fi - all-cffiles: slapd - cf=slapd.conf tmpcf=$$cf.tmp; \ $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \ -e 's;%LOCALSTATEDIR%;$(localstatedir);' \ -e 's;%MODULEDIR%;$(moduledir);' \ - < $(srcdir)/$$cf > $$tmpcf ; \ + slapd.conf > slapd.conf.tmp ; \ touch all-cffiles install-schema: FORCE @@ -265,15 +263,14 @@ install-schema: FORCE install-conf: FORCE @-$(MKDIR) $(DESTDIR)$(sysconfdir) @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-ldbm - cf=slapd.conf tmpcf=$$cf.tmp mode=600 ; \ + $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default if test ! -f $(DESTDIR)$(sysconfdir)/$$cf; then \ echo "installing $$cf in $(sysconfdir)"; \ - echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i"; \ - $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$cf; \ + echo "$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf"; \ + $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf; \ else \ - echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/$$cf" ; \ - fi; \ - $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$cf.default + echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \ + fi install-tools: FORCE @-$(MKDIR) $(DESTDIR)$(sbindir) -- 2.39.5