diff --git a/make/defs.mk b/make/defs.mk index 67a60fd1..4c0024e3 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -222,6 +222,7 @@ INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) INSTALLED_LIB = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) +BUILD_LIB += $(LIB_SO) $(addprefix $(BUILD_LIBDIR)/,$(PLUGIN)) # -- EXE EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*) @@ -706,5 +707,5 @@ CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) RPM_REQUIRES = $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) -NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ].-[^L][^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') +NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')