janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

defs.mk: Prepended FLAVOUR_PREFIX to RPM_REQUIRES

Browse source
This commit is contained in:
Jan Lindemann 2007-08-30 15:21:58 +00:00 • committed by Jan Lindemann
commit 9998835597
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -743,6 +743,8 @@ endif
CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE)
CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) 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') NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')