gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* config.make.in: Set GNUSTEP_HOME to $(HOME). Fix if statements

Browse source 
with filter in them. Fixes bug #16010.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@22753 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2006-04-07 04:26:58 +00:00
parent 4e2144014f
commit ef4bf80cd1
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-04-06 Adam Fedor <fedor@gnu.org>
* config.make.in: Set GNUSTEP_HOME to $(HOME). Fix if statements
with filter in them. Fixes bug #16010.
2006-03-27 Adam Fedor <fedor@gnu.org>
* target.make (openbsd): Add additional link flags for bundle

10
config.make.in
View file

@ -190,14 +190,16 @@ GNUSTEP_USER_DIR = @GNUSTEP_USER_DIR@
-include $(GNUSTEP_CONFIG_FILE)
# FIXME: determining GNUSTEP_HOME
GNUSTEP_HOME = ~
GNUSTEP_HOME = $(HOME)
# Read the user configuration file ... unless it is disabled (ie, set
# to an empty string)
ifneq ($(GNUSTEP_USER_CONFIG_FILE),)
# FIXME - Checking for relative vs. absolute paths!
ifneq (filter (/%, $(GNUSTEP_USER_CONFIG_FILE)),)
# Note: filter does not work in expresssions
GNUSTEP_TEMP_FILTER=$(filter /%, $(GNUSTEP_USER_CONFIG_FILE) )
ifneq ($(GNUSTEP_TEMP_FILTER),)
# Path starts with '/', consider it absolute
-include $(GNUSTEP_USER_CONFIG_FILE)
else
@ -213,7 +215,9 @@ GNUSTEP_FLATTENED = @GNUSTEP_FLATTENED@
# Set GNUSTEP_USER_ROOT from GNUSTEP_USER_DIR; GNUSTEP_USER_ROOT is
# the variable used in practice
#
ifneq (filter (/%, $(GNUSTEP_USER_DIR)),)
# Note: filter does not work in expresssions
GNUSTEP_TEMP_FILTER=$(filter /%, $(GNUSTEP_USER_DIR) )
ifneq ($(GNUSTEP_TEMP_FILTER),)
# Path starts with '/', consider it absolute
GNUSTEP_USER_ROOT = $(GNUSTEP_USER_DIR)
else