Everywhere: Streamline TOPDIR

Make definition and usage of TOPDIR consistent with other projects
This commit is contained in:
Jan Lindemann 2006-08-16 14:53:49 +00:00 committed by Jan Lindemann
commit 2f2c60f614
9 changed files with 19 additions and 19 deletions

View file

@ -283,4 +283,5 @@ o inifile:
o YMisc: o YMisc:
- added cropstr() and unquote() - added cropstr() and unquote()
o make: o make:
- replaced ytools.mk by proj.mk to be consistent with other projects - replaced ytools.mk -> proj.mk and MODDIR definition by TOPDIR definition
to be consistent with other projects

View file

@ -3,8 +3,7 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
TOPDIR=. TOPDIR = .
MODDIR=.
SUBDIRS = inst/pre \ SUBDIRS = inst/pre \
make \ make \
@ -26,9 +25,9 @@ SUBDIRS = inst/pre \
lib include bin \ lib include bin \
inst/post inst/post
ifneq ($(wildcard $(MODDIR)/make/proj.mk),) ifneq ($(wildcard $(TOPDIR)/make/proj.mk),)
include $(MODDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/subdirs.mk include $(MODDIR)/make/subdirs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk

View file

@ -29,9 +29,9 @@
# # # #
######################################################################## ########################################################################
MODDIR = .. TOPDIR = ..
include $(MODDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/scripts.mk include $(MODDIR)/make/scripts.mk
all: all:

View file

@ -3,7 +3,7 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
MODDIR = .. TOPDIR = ..
include $(MODDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/make.mk include $(MODDIR)/make/make.mk

View file

@ -29,9 +29,9 @@
# # # #
######################################################################## ########################################################################
MODDIR = ../.. TOPDIR = ../..
include $(MODDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
EXE_SH += cvsbuild EXE_SH += cvsbuild

View file

@ -1,5 +1,5 @@
MODDIR=.. TOPDIR = ..
SUBDIRS = $(FIND_SUBDIRS) SUBDIRS = $(FIND_SUBDIRS)
include $(MODDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/dirs.mk include $(MODDIR)/make/dirs.mk

View file

@ -2,7 +2,7 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
MODDIR = ../.. TOPDIR = ../..
include $(MODDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/text.mk include $(MODDIR)/make/text.mk

View file

@ -2,7 +2,7 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
MODDIR = ../.. TOPDIR = ../..
include $(MODDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/text.mk include $(MODDIR)/make/text.mk

View file

@ -2,7 +2,7 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
MODDIR = ../.. TOPDIR = ../..
include $(MODDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/text.mk include $(MODDIR)/make/text.mk