diff -urN ldap.temp/build/lib-shared.mk ldap/build/lib-shared.mk
--- ldap.temp/build/lib-shared.mk	Fri Jul 23 11:31:32 1999
+++ ldap/build/lib-shared.mk	Sun Sep 26 21:58:08 1999
@@ -20,5 +20,6 @@
 	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
 	$(RM) ../`$(BASENAME) $@ .la`.a;	\
 	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.a; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
+	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.so; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
 
 Makefile: $(top_srcdir)/build/lib-shared.mk
diff -urN ldap.temp/build/top.mk ldap/build/top.mk
--- ldap.temp/build/top.mk	Sun Sep 26 21:57:22 1999
+++ ldap/build/top.mk	Sun Sep 26 21:57:44 1999
@@ -24,7 +24,7 @@
 
 bindir = $(TMPROOT)@bindir@
 datadir = $(TMPROOT)@datadir@/$(ldap_subdir)
-includedir = $(TMPROOT)@includedir@
+includedir = $(TMPROOT)@includedir@/$(ldap_subdir)
 infodir = $(TMPROOT)@infodir@
 libdir = $(TMPROOT)@libdir@
 libexecdir = $(TMPROOT)@libexecdir@
@@ -91,8 +91,8 @@
 LDBM_LIBS = @LDBM_LIBS@
 LTHREAD_LIBS = @LTHREAD_LIBS@
 
-LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber.la
-LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libldap.la
+LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber-openldap.la
+LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libopenldap.la
 LDAP_LIBLDIF_DEPEND = $(LDAP_LIBDIR)/libldif/libldif.a
 LDAP_LIBLUTIL_DEPEND = $(LDAP_LIBDIR)/liblutil/liblutil.a
 
