From 95c0112176d87f3c5152623fb32025832273b2b1 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 27 May 2009 11:56:26 +0000 Subject: [PATCH] defs.mk, dirs.mk: Follow FEEDFS_DIR change Change FEEDFS_DIR from proj/dspc/src/feedfs to proj/feedfs --- make/defs.mk | 2 +- make/dirs.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/make/defs.mk b/make/defs.mk index a5bc4b8e..02b2fb79 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -765,7 +765,7 @@ LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net endif 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)) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION) diff --git a/make/dirs.mk b/make/dirs.mk index fbc1cd60..a06b97c0 100644 --- a/make/dirs.mk +++ b/make/dirs.mk @@ -3,6 +3,8 @@ # contact@jannet.de # $Id$ +.NOTPARALLEL: + include $(MODDIR)/make/defs.mk ifndef SUBDIRS