From da43cab497bdadd5b39d649be10ca3f19214b31b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 3 Sep 2014 16:02:47 +0000 Subject: [PATCH] defs.mk: Feedfs-rewrite now supplies a lib, use that Add -lfeedfs-rewrite and -I$(FEEDFS_REWRITE_DIR)/include if USE_FEEDFS_REWRITE is true. Signed-off-by: Jan Lindemann --- make/defs.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index f6d7b99d..23f512c8 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -1212,10 +1212,11 @@ FEEDFS_REWRITE_VERSION = $(call version,$(FEEDFS_REWRITE_DIR)) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-rewrite-run = $(FEEDFS_REWRITE_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-rewrite-devel = $(FEEDFS_REWRITE_VERSION) PREREQ_BUILD += feedfs -# no build-time linkage necessary, no headers exported LD_LIB_PATH += $(FEEDFS_REWRITE_DIR)/lib -EXE_SEARCH_PATH += $(FEEDFS_REWRITE_DIR)/bin -LIBFLAGS += -lboost_regex +EXE_SEARCH_PATH += $(FEEDFS_REWRITE_DIR)/bin +INCLUDE += -I$(FEEDFS_REWRITE_DIR)/include +LIBFLAGS += -L$(FEEDFS_REWRITE_DIR)/lib -lfeedfs-rewrite + PREREQ += FEEDFS_REWRITE endif