mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-24 22:50:39 +01:00
defs.mk: Fix USE_FEEDFS
This commit is contained in:
parent
fb3b3cfd9f
commit
6d006ea49a
1 changed files with 3 additions and 2 deletions
|
|
@ -548,14 +548,15 @@ RPM_REQUIRES_DEVEL += dsprout-devel>=$(DSPROUT_VERSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_DSPIDER_SHARED),true)
|
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))
|
DSPIDER_SHARED_VERSION = $(call cat_version,$(DSPIDER_SHARED_DIR))
|
||||||
RPM_REQUIRES_RUN += dspider-shared-run>=$(DSPIDER_SHARED_VERSION)
|
RPM_REQUIRES_RUN += dspider-shared-run>=$(DSPIDER_SHARED_VERSION)
|
||||||
RPM_REQUIRES_DEVEL += dspider-shared-devel>=$(DSPIDER_SHARED_VERSION)
|
RPM_REQUIRES_DEVEL += dspider-shared-devel>=$(DSPIDER_SHARED_VERSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_DSPCD),true)
|
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
|
include $(DSPCD_DIR)/make/public.mk
|
||||||
DSPIDER_DSPCD_VERSION = $(call cat_version,$(DSPCD_DIR))
|
DSPIDER_DSPCD_VERSION = $(call cat_version,$(DSPCD_DIR))
|
||||||
RPM_REQUIRES_RUN += dspider-dspcd-run>=$(DSPIDER_DSPCD_VERSION)
|
RPM_REQUIRES_RUN += dspider-dspcd-run>=$(DSPIDER_DSPCD_VERSION)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue