tidied a little

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@39938 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2016-06-28 10:56:22 +00:00
parent 3a998d4d16
commit 4aea3c5663

View file

@ -115,11 +115,13 @@ else
endif
GNUSTEP_IS_FLATTENED = @GNUSTEP_IS_FLATTENED@
#
# Set GNUSTEP_USER_ROOT from GNUSTEP_USER_DIR; GNUSTEP_USER_ROOT is
# the variable used in practice
#
ifneq ($(GNUSTEP_MAKE_STRICT_V2_MODE),yes)
ifeq ($(GNUSTEP_MAKE_STRICT_V2_MODE),yes)
GNUSTEP_USER_ROOT = $(error GNUSTEP_USER_ROOT is obsolete)
else
#
# Set GNUSTEP_USER_ROOT from GNUSTEP_USER_DIR; GNUSTEP_USER_ROOT is
# the variable used in practice
#
ifneq ($(filter /%, $(GNUSTEP_USER_DIR)),)
# Path starts with '/', consider it absolute
GNUSTEP_USER_ROOT = $(GNUSTEP_USER_DIR)
@ -127,8 +129,6 @@ ifneq ($(GNUSTEP_MAKE_STRICT_V2_MODE),yes)
# Path does no start with '/', try it as relative
GNUSTEP_USER_ROOT = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR)
endif
else
GNUSTEP_USER_ROOT = $(error GNUSTEP_USER_ROOT is obsolete)
endif
# FIXME: Shouldn't the following go into config.make ? They are