From 1e4af4f9d4b4e2f74507e2fee246b8282d960840 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 21 Aug 2007 20:36:12 +0000 Subject: [PATCH] defs.mk: Fix btools compilation - Fix btools rpm dependencies - Fix btools cflags --- make/defs.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index fa2bb0f6..b7b3539e 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -576,11 +576,11 @@ endif ifeq ($(USE_BTOOLS),true) BTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/btools /opt/btools)) BTOOLS_VERSION = $(call cat_version,$(BTOOLS_DIR)) -RPM_REQUIRES_RUN += btools-run >= $(BTOOLS_VERSION) -RPM_REQUIRES_DEVEL += btools-devel >= $(BTOOLS_VERSION) +RPM_REQUIRES_RUN += dspider-btools-run >= $(BTOOLS_VERSION) +RPM_REQUIRES_DEVEL += dspider-btools-devel >= $(BTOOLS_VERSION) USE_YTOOLS = true -INCLUDE += -I$(XCHANGE_DIR)/include -LIBFLAGS += -L$(XCHANGE_DIR)/lib -ldspider-btools +INCLUDE += -I$(BTOOLS_DIR)/include +LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools endif ifeq ($(USE_CCONSOLE),true)