Module: sip-router Branch: master Commit: 3514d04ce924dbb536ddd598f4df0c81cd561dec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3514d04… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 15:45:39 2009 +0200 makefiles: minor COREPATH fixes - COREPATH must now be always defined because of the longer makefile include chain. --- Makefile | 2 +- Makefile.doc | 3 ++- lib/Makefile | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0bd375e..4079bb7 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,7 @@ endif auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc auto_gen_others=cfg.tab.h # auto generated, non-c +COREPATH=. #include source related defs include Makefile.sources #include special targets lists @@ -389,7 +390,6 @@ include Makefile.shared ifeq ($(config_mak),1) -COREPATH=. include Makefile.cfg else diff --git a/Makefile.doc b/Makefile.doc index 46cb1a5..64985bc 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -14,6 +14,7 @@ DOCUMENTS ?= index # Makefiles # ROOT_DIR ?= ../../.. +COREPATH ?=$(ROOT_DIR) # # Output directory where files produced by XSL stylesheets should be stored, @@ -179,7 +180,7 @@ ifeq (,$(MAKECMDGOALS)) include $(dep_files) else ifeq (,$(strip $(nodep_targets))) -include $(ROOT_DIR)/Makefile.targets +include $(COREPATH)/Makefile.targets endif ifneq (,$(filter-out $(nodep_targets) check, $(MAKECMDGOALS))) include $(dep_files) diff --git a/lib/Makefile b/lib/Makefile index 353b76f..1b22fd9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,6 +25,7 @@ subdirs: $(SUBDIRS) $(SUBDIRS): -@echo "Making $(sub_goals) in $@" ; $(MAKE) $(sub_goals) -C $@ +COREPATH=.. include ../Makefile.targets all: subdirs