From 99988355977f3669395f9a88dfd93d4b088a6f7c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 30 Aug 2007 15:21:58 +0000 Subject: [PATCH] defs.mk: Prepended FLAVOUR_PREFIX to RPM_REQUIRES --- make/defs.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/make/defs.mk b/make/defs.mk index 7fa00b23..3ead68f4 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -743,6 +743,8 @@ endif 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) +RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | \ + sed "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g" | \ + sed "s/$(FLAVOUR_PREFIX)$(FLAVOUR_PREFIX)/$(FLAVOUR_PREFIX)/g") NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')