Fix modlist bug in last commit

[openldap] / servers / ldapd / Makefile.in

diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index 23a7c1e082eb22c28c7a945aa1c1acca4160f43a..1db9b2aad0614d62bba14e7fb6140c2c65859a94 100644 (file)
--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@@ -4,6 +4,8 @@
 PROGRAMS=ldapd
 XPROGRAMS=sldapd
 
+XSRCS  = version.c
+
 SRCS   = main.c request.c bind.c result.c error.c \
        search.c util.c compare.c message.c add.c delete.c modrdn.c modify.c \
        abandon.c syntax.c association.c kerberos.c certificate.c
@@ -18,21 +20,20 @@ LDAP_LIBDIR= ../../libraries
 BUILD_OPT = "--enable-ldapd"
 BUILD_SRV = @BUILD_LDAPD@
 
-XLIBS= @LDAPD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@
+all-local-srv:         ldapd
+
+XLIBS= -llber -llutil
+XXLIBS= $(LDAPD_LIBS) $(KRB_LIBS) $(LUTIL_LIBS)
 
 ldapd: version.o
-       $(LDLINK) -o $@ $(OBJS) version.o $(LIBS)
+       $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
 
 sldapd:        version.o
-       $(LDLINK) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv
+       $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
 
-version.c: $(OBJS) $(LDAP_LIBDIR)/liblber/liblber.a
+version.c: $(OBJS) $(LDAP_LIBLBER_DEPEND)
        $(RM) $@
-       (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
-        t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-       -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-       -e "s|%VERSION%|$${v}|" \
-       < $(srcdir)/Version.c > $@)
+       $(MKVERSION) ldapd > $@
 
 request.o:     LDAP-types.h
 
@@ -46,5 +47,5 @@ LDAP_tables.c:        ldap.py
 LDAP-types.h: LDAP_tables.c
 
 install-local-srv: FORCE
-       @$(MKDIR) $(libexecdir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)
+       @-$(MKDIR) $(libexecdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(libexecdir)