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

defs.mk: Remove public.mk from inclusions

Browse source
This commit is contained in:
Jan Lindemann 2007-09-09 17:02:05 +00:00 • committed by Jan Lindemann
commit 3852f12ff2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -601,7 +601,7 @@ endif
ifeq ($(USE_DSPCD),true)
DSPCD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider/dspcd))
DSPCD_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider))
include $(DSPCD_DIR)/make/public.mk
# include $(DSPCD_DIR)/make/public.mk
DSPIDER_DSPCD_VERSION = $(call cat_version,$(DSPCD_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-run = $(DSPIDER_DSPCD_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-devel = $(DSPIDER_DSPCD_VERSION)
@ -630,7 +630,7 @@ endif
ifeq ($(USE_DSPIDER_SHARED),true)
DSPIDER_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider/shared))
DSPIDER_SHARED_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider))
include $(DSPIDER_SHARED_DIR)/make/public.mk
#include $(DSPIDER_SHARED_DIR)/make/public.mk
DSPIDER_SHARED_VERSION = $(call cat_version,$(DSPIDER_SHARED_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-run = $(DSPIDER_SHARED_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-devel = $(DSPIDER_SHARED_VERSION)