From 9d52643310654601dd896e0f516add7971243dc9 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Mon, 9 Feb 2009 07:35:37 +0000
Subject: [PATCH] ITS#5929 create and remove shared library symlinks

---
 build/lib-shared.mk | 8 ++++++++
 build/lib.mk        | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/lib-shared.mk b/build/lib-shared.mk
index e2fe632d3e..b16f4f61ed 100644
--- a/build/lib-shared.mk
+++ b/build/lib-shared.mk
@@ -25,6 +25,14 @@ MKDEPFLAG = -l
 
 $(LIBRARY): version.lo
 	$(LTLINK_LIB) -o $@ $(OBJS) version.lo $(LINK_LIBS)
+	@if test "$(BUILD_LIBS_DYNAMIC)" = shared; then \
+		DIR=`$(PWD)`; DIR=`$(BASENAME) $$DIR`; \
+		dlname=`grep '^dlname=' $@`; \
+		eval $$dlname; \
+		echo "$(RM) ../$$dlname; ln -s $$DIR/.libs/$$dlname .."; \
+		$(RM) ../$$dlname; $(LN_S) $$DIR/.libs/$$dlname .; \
+		mv $$dlname ..; \
+	fi
 
 Makefile: $(top_srcdir)/build/lib-shared.mk
 
diff --git a/build/lib.mk b/build/lib.mk
index 720840921f..dc4bef5ccb 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -41,7 +41,7 @@ clean-common: 	FORCE
 	$(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \
 		$(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \
 		*.o *.lo a.out *.exe core version.c .libs/* \
-		../`$(BASENAME) $(LIBRARY) .la`.so* \
+		../`$(BASENAME) $(LIBRARY) .la`*.so* \
 		../`$(BASENAME) $(LIBRARY) .la`*.dll
 
 depend-common: FORCE
-- 
2.39.5