From 6d006ea49ada57373871dcff2a8d0322a8352c78 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 17 Aug 2007 16:31:09 +0000 Subject: [PATCH] defs.mk: Fix USE_FEEDFS --- make/defs.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index a30388ef..78672844 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -548,14 +548,15 @@ RPM_REQUIRES_DEVEL += dsprout-devel>=$(DSPROUT_VERSION) endif ifeq ($(USE_DSPIDER_SHARED),true) -SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/shared /opt/dspider/shared)) +DSPIDER_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/dspider/shared)) +include $(DSPIDER_SHARED_DIR)/make/public.mk DSPIDER_SHARED_VERSION = $(call cat_version,$(DSPIDER_SHARED_DIR)) RPM_REQUIRES_RUN += dspider-shared-run>=$(DSPIDER_SHARED_VERSION) RPM_REQUIRES_DEVEL += dspider-shared-devel>=$(DSPIDER_SHARED_VERSION) endif ifeq ($(USE_DSPCD),true) -DSPCD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspcd /opt/dspider/dspcd)) +DSPCD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/dspider/dspcd)) include $(DSPCD_DIR)/make/public.mk DSPIDER_DSPCD_VERSION = $(call cat_version,$(DSPCD_DIR)) RPM_REQUIRES_RUN += dspider-dspcd-run>=$(DSPIDER_DSPCD_VERSION)