From a20404a74fb7dd0470371ff70bb24fb7a6872596 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 7 Jun 2009 14:30:58 +0000 Subject: [PATCH] defs.mk: Fix LIBPATH for USE_CCONSOLE = true Hopefulls fix USE_CCONSOLE implications, most prominently LIBPATH, which should point to /opt/$(FLAVOUR_PATH_PREFIX)dspider/feedfs/bin in production builds. --- make/defs.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/make/defs.mk b/make/defs.mk index 27dcfdd1..6f00f81a 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -656,6 +656,7 @@ CCASFS_VERSION = $(call version,$(CCASFS_DIR)) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION) USE_YTOOLS = true +USE_CCONSOLE = true INCLUDE += -I$(CCASFS_DIR)/include #LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole endif @@ -666,8 +667,19 @@ CCONSOLE_VERSION = $(call version,$(CCONSOLE_DIR)) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION) USE_YTOOLS = true +USE_XCHANGE = true +USE_USERVER = true +USE_DSPIDER_SHARED = true +USE_DSPROUT = true +USE_FEEDFS = true INCLUDE += -I$(CCONSOLE_DIR)/include -LIBFLAGS += -L$(CCONSOLE_DIR)/lib -ldspider-cconsole +ifeq ($(DEVELOPMENT),true) +LIBFLAGS += $(CCONSOLE_DIR)/lib +else +# this is actually redundant to a definition in proj/dspc/src/cconsole/make/cfg_dist.mk: +LIBFLAGS += $(ENV_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)dspider/feedfs/bin +endif +LIBFLAGS += -ldspider-cconsole endif ifeq ($(USE_DSPCD),true)