janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk: Fix LIBPATH for USE_CCONSOLE = true

Browse source 
Hopefulls fix USE_CCONSOLE implications, most prominently LIBPATH,
which should point to /opt/$(FLAVOUR_PATH_PREFIX)dspider/feedfs/bin
in production builds.
This commit is contained in:
Jan Lindemann 2009-06-07 14:30:58 +00:00 • committed by Jan Lindemann
commit a20404a74f
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
make/defs.mk
View file

@ -656,6 +656,7 @@ CCASFS_VERSION = $(call version,$(CCASFS_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION)
USE_YTOOLS = true USE_YTOOLS = true
USE_CCONSOLE = true
INCLUDE += -I$(CCASFS_DIR)/include INCLUDE += -I$(CCASFS_DIR)/include
#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole #LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole
endif endif
@ -666,8 +667,19 @@ CCONSOLE_VERSION = $(call version,$(CCONSOLE_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION)
USE_YTOOLS = true USE_YTOOLS = true
USE_XCHANGE = true
USE_USERVER = true
USE_DSPIDER_SHARED = true
USE_DSPROUT = true
USE_FEEDFS = true
INCLUDE += -I$(CCONSOLE_DIR)/include 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 endif
ifeq ($(USE_DSPCD),true) ifeq ($(USE_DSPCD),true)