Better fix for filter in if statement

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@22754 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2006-04-07 04:39:59 +00:00
parent ef4bf80cd1
commit 0c6fbb4a5c

View file

@ -197,9 +197,7 @@ GNUSTEP_HOME = $(HOME)
ifneq ($(GNUSTEP_USER_CONFIG_FILE),)
# FIXME - Checking for relative vs. absolute paths!
# Note: filter does not work in expresssions
GNUSTEP_TEMP_FILTER=$(filter /%, $(GNUSTEP_USER_CONFIG_FILE) )
ifneq ($(GNUSTEP_TEMP_FILTER),)
ifneq ($(filter /%, $(GNUSTEP_USER_CONFIG_FILE)),)
# Path starts with '/', consider it absolute
-include $(GNUSTEP_USER_CONFIG_FILE)
else
@ -215,9 +213,7 @@ GNUSTEP_FLATTENED = @GNUSTEP_FLATTENED@
# Set GNUSTEP_USER_ROOT from GNUSTEP_USER_DIR; GNUSTEP_USER_ROOT is
# the variable used in practice
#
# Note: filter does not work in expresssions
GNUSTEP_TEMP_FILTER=$(filter /%, $(GNUSTEP_USER_DIR) )
ifneq ($(GNUSTEP_TEMP_FILTER),)
ifneq ($(filter /%, $(GNUSTEP_USER_DIR)),)
# Path starts with '/', consider it absolute
GNUSTEP_USER_ROOT = $(GNUSTEP_USER_DIR)
else