2
0
Эх сурвалжийг харах

makefiles: minor COREPATH fixes

- COREPATH must now be always defined because of the longer makefile
  include chain.
Andrei Pelinescu-Onciul 16 жил өмнө
parent
commit
3514d04ce9
3 өөрчлөгдсөн 4 нэмэгдсэн , 2 устгасан
  1. 1 1
      Makefile
  2. 2 1
      Makefile.doc
  3. 1 0
      lib/Makefile

+ 1 - 1
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

+ 2 - 1
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)

+ 1 - 0
lib/Makefile

@@ -25,6 +25,7 @@ subdirs: $(SUBDIRS)
 $(SUBDIRS):	
 			-@echo "Making $(sub_goals) in $@" ; $(MAKE) $(sub_goals) -C $@
 
+COREPATH=..
 include ../Makefile.targets
 
 all:	subdirs