Fix ITS#3424

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 57fee8be3f230aeec7d8ddd4e1c210fd6806468c..5bea09f84f442cdc1b21122b422ba47aed85984c 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -34,10 +34,10 @@ SRCS        = main.c globals.c config.c daemon.c \
                schemaparse.c ad.c at.c mr.c syntax.c oc.c saslauthz.c \
                oidm.c starttls.c index.c sets.c referral.c root_dse.c \
                sasl.c module.c mra.c mods.c sl_malloc.c limits.c \
-               backglue.c operational.c matchedValues.c cancel.c syncrepl.c \
-               backover.c ctxcsn.c ldapsync.c sessionlog.c \
+               operational.c matchedValues.c cancel.c syncrepl.c \
+               backover.c ctxcsn.c ldapsync.c sessionlog.c frontend.c \
                slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \
-               slappasswd.c slaptest.c slapauth.c slapacl.c \
+               slappasswd.c slaptest.c slapauth.c slapacl.c component.c \
                $(@PLAT@_SRCS)
 
 OBJS   = main.o globals.o config.o daemon.o \
@@ -51,13 +51,13 @@ OBJS        = main.o globals.o config.o daemon.o \
                schemaparse.o ad.o at.o mr.o syntax.o oc.o saslauthz.o \
                oidm.o starttls.o index.o sets.o referral.o root_dse.o \
                sasl.o module.o mra.o mods.o sl_malloc.o limits.o \
-               backglue.o operational.o matchedValues.o cancel.o syncrepl.o \
-               backover.o ctxcsn.o ldapsync.o sessionlog.o \
+               operational.o matchedValues.o cancel.o syncrepl.o \
+               backover.o ctxcsn.o ldapsync.o sessionlog.o frontend.o \
                slapadd.o slapcat.o slapcommon.o slapdn.o slapindex.o \
-               slappasswd.o slaptest.o slapauth.o slapacl.o \
+               slappasswd.o slaptest.o slapauth.o slapacl.o component.o \
                $(@PLAT@_OBJS)
 
-LDAP_INCDIR= ../../include -I$(srcdir)/slapi
+LDAP_INCDIR= ../../include -I$(srcdir)/slapi -I.
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
@@ -257,15 +257,15 @@ libslapi.a: slapi/.libs/libslapi.a
 slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
        $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
                $(WRAP_LIBS)
-       rm -f $(SLAPTOOLS)
+       $(RM) $(SLAPTOOLS)
        for i in $(SLAPTOOLS); do \
-               $(LN_S) slapd $$i; done
+               $(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done
 
 
 sslapd: version.o
        $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
 
-$(SLAPD_DYNAMIC_BACKENDS): slapd
+dummy $(SLAPD_DYNAMIC_BACKENDS): slapd
        cd $@; $(MAKE) $(MFLAGS) all
        @touch $@
 
@@ -330,7 +330,7 @@ depend-local-srv: FORCE
        @echo ""
 
 clean-local:
-       rm -f *.exp *.def *.base *.a *.objs symdummy.c
+       $(RM) *.exp *.def *.base *.a *.objs symdummy.c
 
 clean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
@@ -340,7 +340,7 @@ clean-local-srv: FORCE
                        if test $$? != 0 ; then exit 1; fi ; \
                fi; \
        done
-       rm -f *.tmp all-cffiles
+       $(RM) *.tmp all-cffiles
 
 veryclean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
@@ -350,7 +350,8 @@ veryclean-local-srv: FORCE
                fi; \
        done
 
-install-local-srv: install-slapd install-conf install-schema install-tools
+install-local-srv: install-slapd install-tools \
+       install-conf install-db-config install-schema install-tools
 
 install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(libexecdir)
@@ -406,7 +407,6 @@ install-schema: FORCE
 
 install-conf: FORCE
        @-$(MKDIR) $(DESTDIR)$(sysconfdir)
-       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
        $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default
        if test ! -f $(DESTDIR)$(sysconfdir)/slapd.conf; then \
                echo "installing slapd.conf in $(sysconfdir)"; \
@@ -416,11 +416,18 @@ install-conf: FORCE
                echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \
        fi
 
+install-db-config: FORCE
+       @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
+       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+       $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+               $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+       $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+               $(DESTDIR)$(sysconfdir)/DB_CONFIG.example
+
 install-tools: FORCE
        -$(MKDIR) $(DESTDIR)$(sbindir)
-       cd $(DESTDIR)$(sbindir); \
-       rm -f $(SLAPTOOLS); \
        for i in $(SLAPTOOLS); do \
-               $(LN_S) $(libexecdir)/slapd $$i; \
+               $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+               $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
        done