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

Fix for non-flattened usage

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23053 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-06-14 08:45:51 +00:00
parent 8b02e7b6c7
commit 04d7f7aed9
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-06-14 Richard Frith-Macdonald <rfm@gnu.org>
* common.make: determine host/target info before trying to load
host/target specific configuration.
2006-05-01 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Change --with... options specifying paths so that if

37
common.make
View file

@ -27,7 +27,25 @@ COMMON_MAKE_LOADED = yes
SHELL = /bin/sh
#
# Get the config information first, this includes GNUSTEP_SYSTEM_ROOT etc.
# Determine the compilation host and target
#
include $(GNUSTEP_MAKEFILES)/names.make
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_HOST_DIR = $(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
GNUSTEP_HOST_LDIR = $(GNUSTEP_HOST_DIR)/$(LIBRARY_COMBO)
GNUSTEP_TARGET_LDIR = $(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
else
GNUSTEP_HOST_DIR = .
GNUSTEP_TARGET_DIR = .
GNUSTEP_HOST_LDIR = .
GNUSTEP_TARGET_LDIR = .
endif
#
# Get the config information (host/target specific),
# this includes GNUSTEP_SYSTEM_ROOT etc.
#
include $(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_DIR)/config.make
@ -67,23 +85,6 @@ ifeq ($(GNUSTEP_MAKEFILES),)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Library/Makefiles
endif
#
# Determine the compilation host and target
#
include $(GNUSTEP_MAKEFILES)/names.make
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_HOST_DIR = $(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
GNUSTEP_HOST_LDIR = $(GNUSTEP_HOST_DIR)/$(LIBRARY_COMBO)
GNUSTEP_TARGET_LDIR = $(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
else
GNUSTEP_HOST_DIR = .
GNUSTEP_TARGET_DIR = .
GNUSTEP_HOST_LDIR = .
GNUSTEP_TARGET_LDIR = .
endif
#
# Sanity checks - only performed at the first make invocation
#