Author: rfm
Date: Tue Jun 28 12:56:22 2016
New Revision: 39938
URL: http://svn.gna.org/viewcvs/gnustep?rev=39938&view=rev
Log:
tidied a little
Modified:
tools/make/trunk/config-noarch.make.in
Modified: tools/make/trunk/config-noarch.make.in
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/config-noarch.make.in?rev=39938&r1=39937&r2=39938&view=diff
==============================================================================
--- tools/make/trunk/config-noarch.make.in (original)
+++ tools/make/trunk/config-noarch.make.in Tue Jun 28 12:56:22 2016
@@ -115,11 +115,13 @@
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 @@
# 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
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
