diff --git a/make/defs.mk b/make/defs.mk index 99f0d822..7dd2276e 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -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