janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

defs.mk, dirs.mk: Follow FEEDFS_DIR change

Browse source 
Change FEEDFS_DIR from proj/dspc/src/feedfs to proj/feedfs
This commit is contained in:
Jan Lindemann 2009-05-27 11:56:26 +00:00 • committed by Jan Lindemann
commit 95c0112176
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs.mk
View file

@ -765,7 +765,7 @@ LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net
endif endif
ifeq ($(USE_FEEDFS),true) ifeq ($(USE_FEEDFS),true)
FEEDFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/feedfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs)) FEEDFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs))
FEEDFS_VERSION = $(call version,$(FEEDFS_DIR)) FEEDFS_VERSION = $(call version,$(FEEDFS_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION)

2
make/dirs.mk
View file

@ -3,6 +3,8 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
.NOTPARALLEL:
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
ifndef SUBDIRS ifndef SUBDIRS