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

Updated comments

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23562 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-09-19 02:36:49 +00:00
parent 2484f77386
commit cf81121ccf
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common.make
View file

@ -71,7 +71,7 @@ include $(GNUSTEP_MAKEFILES)/library-combo.make
#
# Get the config information (host/target/library-combo specific),
# this includes GNUSTEP_SYSTEM_ROOT etc.
# this includes CC, OPTFLAGS etc.
#
include $(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_LDIR)/config.make
@ -497,14 +497,16 @@ SUBPROJECT_PRODUCT = subproject$(OEXT)
ifeq ($(JAVA_HOME),)
# Else, try JDK_HOME
ifeq ($(JDK_HOME),)
# Else, try by finding the path of javac and removing 'bin/javac' from it
# Else, try by finding the path of javac and removing 'bin/javac' from it.
# Please note that this is really inefficient, you should rather
# set JAVA_HOME!
ifeq ($(JAVAC),)
JAVA_HOME = $(shell which javac | sed "s/bin\/javac//g")
else # $(JAVAC) != ""
else # $(JAVAC) != ""
JAVA_HOME = $(shell which $(JAVAC) | sed "s/bin\/javac//g")
endif
endif
else # $(JDK_HOME) != ""
JAVA_HOME = $(JDK_HOME)
JAVA_HOME = $(JDK_HOME)
endif
endif