janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk: Fix regex for getting LD_LIB_PATH from LDFLAGS

Browse source
This commit is contained in:
Jan Lindemann 2008-11-25 23:43:33 +00:00 • committed by Jan Lindemann
commit 9343fbd028
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -617,7 +617,7 @@ ifeq ($(STRIP_SYMBOLS),true)
endif
INCLUDE += $(LOCAL_INCLUDE) -I. $(PROJECT_INCLUDE) -I$(TOPDIR)/include
LIBFLAGS += $(LOCAL_LDFLAGS) -L$(BUILD_LIBDIR)
LIBFLAGS += -L$(BUILD_LIBDIR)
# -- use of supplementary libraries
@ -875,6 +875,6 @@ CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
#RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
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] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
endif