X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=a49ce0e4393b9f89f4dcb29ded4f723aa5675332;hb=749404b83fa8dac94c75dc39dce8e5d80cda9a7f;hp=7e84bc69be6de72a4dc7c062b43d67ec514c8105;hpb=28a671d10de22b45cd9007b0953468b5bbd02bc3;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 7e84bc69be..a49ce0e439 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -23,9 +23,9 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 # $(LTHREAD_LIBS) must be last
-XLIBS = libbackends.a -lavl -lldbm -lldif -lldap -llber -llthread -llutil
+XLIBS = libbackends.a -lavl -lldbm -lldif -lldap_r -llber -llutil
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) \
-	$(KRB_LIBS) $(LUTIL_LIBS)
+	$(PERL_LDFLAGS) $(KRB_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 
 BUILD_OPT = "--enable-slapd"
@@ -75,12 +75,7 @@ libbackends.a: .backend
 	fi
 	@ls -l libbackends.a
 
-version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
-		$(LDAP_LIBDIR)/libldbm.a \
-		$(LDAP_LIBDIR)/libavl.a \
-		$(LDAP_LIBDIR)/libldif.a \
-		$(LDAP_LIBDIR)/liblutil.a \
-		$(LDAP_LIBDIR)/liblthread.a 
+version.c: libbackends.a $(OBJS) $(SLAPD_LIBDEPEND) 
 	$(RM) $@
 	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
 	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
@@ -117,15 +112,22 @@ install-conf: FORCE
 	@-$(MKDIR) $(sysconfdir)
 	@for i in $(CFFILES); do \
 		tmpcf=/tmp/$$i.$$ ; \
-		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $(srcdir)/$$i > $$tmpcf ; \
+		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 644 $$tmpcf $(sysconfdir)/$$i"; \
-			$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i; \
+			echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i"; \
+			$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i; \
 		else \
 			echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
 		fi; \
-		$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i.default; \
+		$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i.default ; \
 		$(RM) -f $$tmpcf ; \
 	done