Minor adjustments based upon initial read of draft-ietf-ldapext-ldap-c-api-04.txt.

[openldap] / libraries / libldap / Makefile.in

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index c57240e416d35eac89ea564a8500f0aa005275cf..f4cf68cd87734d7abdb224f80961d31e48eeb296 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ## Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
@@ -16,7 +17,7 @@ SRCS  = bind.c open.c result.c error.c compare.c search.c \
        getdn.c getentry.c getattr.c getvalues.c addentry.c \
        request.c getdxbyname.c os-ip.c url.c charset.c \
        init.c options.c print.c string.c util-int.c schema.c \
-       charray.c digest.c
+       charray.c digest.c tls.c dn.c
 OBJS   = bind.lo open.lo result.lo error.lo compare.lo search.lo \
        controls.lo messages.lo references.lo extended.lo \
        modify.lo add.lo modrdn.lo delete.lo abandon.lo ufn.lo cache.lo \
@@ -25,13 +26,13 @@ OBJS        = bind.lo open.lo result.lo error.lo compare.lo search.lo \
        getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
        request.lo getdxbyname.lo os-ip.lo url.lo charset.lo \
        init.lo options.lo print.lo string.lo util-int.lo schema.lo \
-       charray.lo digest.lo
+       charray.lo digest.lo tls.lo dn.lo
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
 XLIBS = -lldap -llber
-XXLIBS = $(KRB_LIBS)
+XXLIBS = $(SECURITY_LIBS) $(TLS_LIBS)
 
 apitest:       $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
        $(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
@@ -43,20 +44,20 @@ ttest:      $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
 CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
 
 install-local: $(CFFILES) FORCE
-       -$(MKDIR) $(libdir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
-       -$(MKDIR) $(sysconfdir)
+       -$(MKDIR) $(DESTDIR)$(libdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+       -$(MKDIR) $(DESTDIR)$(sysconfdir)
        @for i in $(CFFILES); do \
-               if test ! -f $(sysconfdir)/$$i; then \
+               if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
                        echo "installing $$i in $(sysconfdir)"; \
-                       echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i"; \
-                       $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i; \
+                       echo "$(INSTALL) $(INSTALLFLAGS) -m 644  $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i"; \
+                       $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i; \
                else \
                        echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
                fi; \
-               $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i.default; \
+               $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.default; \
        done
-       -$(MKDIR) $(datadir)
-       -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly-
-       $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(datadir)/ldapfriendly
+       -$(MKDIR) $(DESTDIR)$(datadir)
+       -$(MV) $(DESTDIR)$(datadir)/ldapfriendly $(DESTDIR)$(datadir)/ldapfriendly-
+       $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(DESTDIR)$(datadir)/ldapfriendly