mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-06 03:40:44 +00:00
Updated for new/better way of checking if we're running top-level, plus
removed code no longer useful git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21880 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
3d8cf6ecc4
commit
3a51762edf
1 changed files with 7 additions and 21 deletions
28
common.make
28
common.make
|
@ -87,28 +87,14 @@ endif
|
||||||
#
|
#
|
||||||
# Sanity checks - only performed at the first make invocation
|
# Sanity checks - only performed at the first make invocation
|
||||||
#
|
#
|
||||||
ifeq ($(MAKELEVEL),0)
|
# FIXME - these checks should probably be removed and/or rewritten.
|
||||||
|
#
|
||||||
|
|
||||||
# Sanity check on GNUSTEP_*_ROOT. We want them all to be non-empty.
|
# Please note that _GNUSTEP_TOP_INVOCATION_DONE is set by the first
|
||||||
GNUSTEP_ERROR =
|
# time Master/rules.make is read, and propagated to sub-makes. So
|
||||||
|
# this check will pass only the very first time we parse this file,
|
||||||
ifeq ($(GNUSTEP_USER_ROOT),)
|
# and if Master/rules.make have not yet been parsed.
|
||||||
GNUSTEP_ERROR=GNUSTEP_USER_ROOT
|
ifeq ($(_GNUSTEP_TOP_INVOCATION_DONE),)
|
||||||
endif
|
|
||||||
ifeq ($(GNUSTEP_LOCAL_ROOT),)
|
|
||||||
GNUSTEP_ERROR=GNUSTEP_LOCAL_ROOT
|
|
||||||
endif
|
|
||||||
ifeq ($(GNUSTEP_NETWORK_ROOT),)
|
|
||||||
GNUSTEP_ERROR=GNUSTEP_NETWORK_ROOT
|
|
||||||
endif
|
|
||||||
ifeq ($(GNUSTEP_SYSTEM_ROOT),)
|
|
||||||
GNUSTEP_ERROR=GNUSTEP_SYSTEM_ROOT
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(GNUSTEP_ERROR),)
|
|
||||||
$(warning ERROR: Your $(GNUSTEP_ERROR) environment variable is empty !)
|
|
||||||
$(error Please try again after running ". $(GNUSTEP_MAKEFILES)/GNUstep.sh")
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Sanity check on $PATH - NB: if PATH is wrong, we can't do certain things
|
# Sanity check on $PATH - NB: if PATH is wrong, we can't do certain things
|
||||||
# because we can't run the tools (not even using opentool as we can't even
|
# because we can't run the tools (not even using opentool as we can't even
|
||||||
|
|
Loading…
Reference in a new issue