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

Set JAVA_HOME (guessing if needed) in common.make

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/branches/freeze-0_6_6@6991 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2000-07-27 15:47:31 +00:00
parent 0d16b811d5
commit d2dfdef1b5
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
common.make
View file

@ -336,17 +336,34 @@ GNUSTEP_DVIPS_FLAGS =
SUBPROJECT_PRODUCT = subproject$(OEXT)
#
# The Java Compiler. Override this by setting the JAVAC environment variable
# Set JAVA_HOME if not set.
#
ifeq ($(JAVAC),)
JAVAC = javac
ifeq ($(JAVA_HOME),)
# Else, try JDK_HOME
ifeq ($(JDK_HOME),)
# Else, try by finding the path of javac and removing 'bin/javac' from it
ifeq ($(JAVAC),)
JAVA_HOME = $(shell which javac | sed "s/bin\/javac//g")
else # $(JAVAC) != ""
JAVA_HOME = $(shell which $(JAVAC) | sed "s/bin\/javac//g")
endif
else # $(JDK_HOME) != ""
JAVA_HOME = $(JDK_HOME)
endif
endif
#
# The Java Header Compiler.
# The Java Compiler.
#
ifeq ($(JAVAC),)
JAVAC = $(JAVA_HOME)/bin/javac
endif
#
# The Java Header Compiler.
#
ifeq ($(JAVAH),)
JAVAH = javah
JAVAH = $(JAVA_HOME)/bin/javah
endif
## Local variables: