Browse code

makefiles: minor COREPATH fixes

- COREPATH must now be always defined because of the longer makefile
include chain.

Andrei Pelinescu-Onciul authored on 23/04/2009 13:45:39
Showing 3 changed files
... ...
@@ -77,6 +77,7 @@ endif
77 77
 auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc
78 78
 auto_gen_others=cfg.tab.h  # auto generated, non-c
79 79
 
80
+COREPATH=.
80 81
 #include  source related defs
81 82
 include Makefile.sources
82 83
 #include special targets lists
... ...
@@ -389,7 +390,6 @@ include Makefile.shared
389 389
 
390 390
 ifeq ($(config_mak),1)
391 391
 
392
-COREPATH=.
393 392
 include Makefile.cfg
394 393
 
395 394
 else
... ...
@@ -14,6 +14,7 @@ DOCUMENTS ?= index
14 14
 # Makefiles
15 15
 #
16 16
 ROOT_DIR ?= ../../..
17
+COREPATH  ?=$(ROOT_DIR)
17 18
 
18 19
 #
19 20
 # Output directory where files produced by XSL stylesheets should be stored,
... ...
@@ -179,7 +180,7 @@ ifeq (,$(MAKECMDGOALS))
179 179
 include $(dep_files) 
180 180
 else
181 181
 ifeq (,$(strip $(nodep_targets)))
182
-include $(ROOT_DIR)/Makefile.targets
182
+include $(COREPATH)/Makefile.targets
183 183
 endif
184 184
 ifneq (,$(filter-out $(nodep_targets) check, $(MAKECMDGOALS)))
185 185
 include $(dep_files)
... ...
@@ -25,6 +25,7 @@ subdirs: $(SUBDIRS)
25 25
 $(SUBDIRS):	
26 26
 			-@echo "Making $(sub_goals) in $@" ; $(MAKE) $(sub_goals) -C $@
27 27
 
28
+COREPATH=..
28 29
 include ../Makefile.targets
29 30
 
30 31
 all:	subdirs