Implemented the open, init functions correctly

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index c010e5395f38d5bbf4739e81364a43aefd01a56e..a49ce0e4393b9f89f4dcb29ded4f723aa5675332 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -22,6 +22,12 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
+# $(LTHREAD_LIBS) must be last
+XLIBS = libbackends.a -lavl -lldbm -lldif -lldap_r -llber -llutil
+XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) \
+       $(PERL_LDFLAGS) $(KRB_LIBS) $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
+
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
@@ -30,10 +36,6 @@ all-local-srv: FORCE
        $(MAKE) $(MFLAGS) slapd
        (cd tools; $(MAKE) $(MFLAGS) all)
 
-XLIBS = @SLAPD_LIBS@ libbackends.a \
-       -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \
-       $(KRB_LIBS) -llutil @LUTIL_LIBS@
-
 slapd: version.o
        $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
 
@@ -73,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}|" \
@@ -115,15 +112,22 @@ install-conf: FORCE
        @-$(MKDIR) $(sysconfdir)
        @for i in $(CFFILES); do \
                tmpcf=/tmp/$$i.$$ ; \
-               $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $$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