janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-16 04:23:31 +01:00
Code Activity

defs.mk: Fix lib handling

Browse source 
- Fix LD_LIBRARY_PATH
  - Add missing installation of plugins to BUILD_LIBDIR
This commit is contained in:
Jan Lindemann 2007-08-23 01:56:44 +00:00 • committed by Jan Lindemann
commit 23538e3d39
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/defs.mk
View file

@ -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')