mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
Everywhere: Streamline TOPDIR
Make definition and usage of TOPDIR consistent with other projects
This commit is contained in:
parent
e50f445d14
commit
2f2c60f614
9 changed files with 19 additions and 19 deletions
3
CHANGES
3
CHANGES
|
|
@ -283,4 +283,5 @@ o inifile:
|
|||
o YMisc:
|
||||
- added cropstr() and unquote()
|
||||
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
|
||||
|
|
|
|||
7
Makefile
7
Makefile
|
|
@ -3,8 +3,7 @@
|
|||
# contact@jannet.de
|
||||
# $Id$
|
||||
|
||||
TOPDIR=.
|
||||
MODDIR=.
|
||||
TOPDIR = .
|
||||
|
||||
SUBDIRS = inst/pre \
|
||||
make \
|
||||
|
|
@ -26,9 +25,9 @@ SUBDIRS = inst/pre \
|
|||
lib include bin \
|
||||
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/subdirs.mk
|
||||
include $(MODDIR)/make/rules.mk
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@
|
|||
# #
|
||||
########################################################################
|
||||
|
||||
MODDIR = ..
|
||||
TOPDIR = ..
|
||||
|
||||
include $(MODDIR)/make/proj.mk
|
||||
include $(TOPDIR)/make/proj.mk
|
||||
include $(MODDIR)/make/scripts.mk
|
||||
|
||||
all:
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# contact@jannet.de
|
||||
# $Id$
|
||||
|
||||
MODDIR = ..
|
||||
TOPDIR = ..
|
||||
|
||||
include $(MODDIR)/make/proj.mk
|
||||
include $(TOPDIR)/make/proj.mk
|
||||
include $(MODDIR)/make/make.mk
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@
|
|||
# #
|
||||
########################################################################
|
||||
|
||||
MODDIR = ../..
|
||||
TOPDIR = ../..
|
||||
|
||||
include $(MODDIR)/make/proj.mk
|
||||
include $(TOPDIR)/make/proj.mk
|
||||
|
||||
EXE_SH += cvsbuild
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
MODDIR=..
|
||||
TOPDIR = ..
|
||||
SUBDIRS = $(FIND_SUBDIRS)
|
||||
|
||||
include $(MODDIR)/make/proj.mk
|
||||
include $(TOPDIR)/make/proj.mk
|
||||
include $(MODDIR)/make/dirs.mk
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# contact@jannet.de
|
||||
# $Id$
|
||||
|
||||
MODDIR = ../..
|
||||
TOPDIR = ../..
|
||||
|
||||
include $(MODDIR)/make/proj.mk
|
||||
include $(TOPDIR)/make/proj.mk
|
||||
include $(MODDIR)/make/text.mk
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# contact@jannet.de
|
||||
# $Id$
|
||||
|
||||
MODDIR = ../..
|
||||
TOPDIR = ../..
|
||||
|
||||
include $(MODDIR)/make/proj.mk
|
||||
include $(TOPDIR)/make/proj.mk
|
||||
include $(MODDIR)/make/text.mk
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# contact@jannet.de
|
||||
# $Id$
|
||||
|
||||
MODDIR = ../..
|
||||
TOPDIR = ../..
|
||||
|
||||
include $(MODDIR)/make/proj.mk
|
||||
include $(TOPDIR)/make/proj.mk
|
||||
include $(MODDIR)/make/text.mk
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue