From c3f95cc80c5f0dbc8e795e15af9c7fdfe4ea1963 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Fri, 12 Jun 2009 19:43:23 +0000
Subject: [PATCH] fix: CONTRIB_LIBS were copied to build directory, but not
 installed

---
 make/defs.mk |  8 ++++++--
 make/lib.mk  | 12 +++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index c35aabe8..3d20b08b 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -247,6 +247,11 @@ INSTALLED_DOC         ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS))
 
 # -- LIB
 BUILD_LIBDIR           = $(TOPDIR)/lib
+LOCAL_LIBS            += $(CONTRIB_LIBS)
+ifeq ($(TARGET),mingw)
+CONTRIB_LIBS_PATH     += $(CROSS_TOOL_DIR)/bin
+endif
+
 LIBNAME               ?= $(PROJECT)
 LIBTYPE               ?= shared
 MEMBERS               += $(LIB_A)($(OBJ))
@@ -262,7 +267,6 @@ SO_SUFFIX              = so.$(shell echo $(VERSION) | cut -d- -f1)
 LIB_SO                 = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
 LINKS_SO              += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
 INSTALLED_LINKS_SO    += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
-INSTALLED_LIB_SO       = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
 INSTALLED_LIB_A        = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
 else
 LIB_A                  = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
@@ -270,9 +274,9 @@ SO_SUFFIX              = dll
 LIB_DEF                = $(BUILD_LIBDIR)/$(LIBNAME).def
 MSVCPP_IMPLIB          = $(BUILD_LIBDIR)/$(LIBNAME).lib
 LIB_SO                 = $(BUILD_LIBDIR)/$(LIBNAME).dll
-INSTALLED_LIB_SO       = $(INSTALL_LIBDIR)/$(LIBNAME).$(SO_SUFFIX)
 INSTALLED_LIB_A        = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
 endif
+INSTALLED_LIB_SO       = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO)))
 INSTALLED_DEF          = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp))
 INSTALLED_LIB         += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS))
 BUILD_LIB             += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS))
diff --git a/make/lib.mk b/make/lib.mk
index 7de2f6d0..dfd09376 100644
--- a/make/lib.mk
+++ b/make/lib.mk
@@ -33,19 +33,17 @@ ld-%.conf:
 clean.ld-conf:
 	rm -f $(LD_CONF)
 
+echo.libs:
+	@echo INSTALLED_LIB_SO = $(INSTALLED_LIB_SO)
+	@echo INSTALLED_LIB    = $(INSTALLED_LIB)
+
 # ------------------------------------------ contrib libraries
-LOCAL_LIBS        += $(CONTRIB_LIBS)
-
-ifeq ($(TARGET),mingw)
-CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin
-endif
-
 # deps on mandatory targets
 all: $(CONTRIB_LIBS)
 clean: clean.contrib-libs
 
 # deps on optional targets
-echo-contrib: echo.contrib-libs
+echo-contrib: echo.contrib-libs echo.libs
 
 # rules
 clean.contrib-libs: