summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2012-03-06 07:26:02 (EST)
committer Krzysztof Daniel2012-03-06 07:26:02 (EST)
commitb79e2bb0f1de6b9cec85a8f5743fc5f85206479f (patch)
tree53d61af735e92facf40625ea21f8ecc73409e461
parent4ea40760b3b7859ea85ed7b2cdf3399e24c1fbe0 (diff)
downloadeclipse.platform.resources-b79e2bb0f1de6b9cec85a8f5743fc5f85206479f.zip
eclipse.platform.resources-b79e2bb0f1de6b9cec85a8f5743fc5f85206479f.tar.gz
eclipse.platform.resources-b79e2bb0f1de6b9cec85a8f5743fc5f85206479f.tar.bz2
Hardcoded dependency to IBM Java in or.eclipse.core.filesystem.v20120306-1226I20120328-2028I20120328-2020I20120328-2007I20120328-1956refs/changes/58/5258/2
Removed exlicit setting of JAVA_HOME. https://bugs.eclipse.org/bugs/show_bug.cgi?id=369204 Change-Id: I6ea0e032f31c89d30def281d6d26ff820dddf5d4
-rw-r--r--bundles/org.eclipse.core.filesystem/natives/unix/linux/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.core.filesystem/natives/unix/linux/Makefile b/bundles/org.eclipse.core.filesystem/natives/unix/linux/Makefile
index f5533bf..1dc4f16 100644
--- a/bundles/org.eclipse.core.filesystem/natives/unix/linux/Makefile
+++ b/bundles/org.eclipse.core.filesystem/natives/unix/linux/Makefile
@@ -20,7 +20,9 @@ LIB_NAME_FULL = libunixfile_1_0_0.so
OS_TYPE = linux
#Set this to be the location of your JRE
-JAVA_HOME = /usr/lib/jvm/java-1.5.0-ibm-1.5.0.9/
+ifeq (${JAVA_HOME},)
+ JAVA_HOME = /usr/lib/jvm/java-1.5.0-ibm-1.5.0.9/
+endif
JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
OPT_FLAGS=-O -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64