From: Not Zed <notzed@gmail.com>
Date: Tue, 7 Dec 2021 23:49:44 +0000 (+1030)
Subject: Use saner non-versioned defaults
X-Git-Url: https://code.zedzone.au/cvs?a=commitdiff_plain;h=e2d6fbc2af414ed5ea2216967d37d686d39b55c1;p=nativez

Use saner non-versioned defaults
Use full paths to java tools
---

diff --git a/config.make.in b/config.make.in
index 388d51e..18b53d1 100644
--- a/config.make.in
+++ b/config.make.in
@@ -1,13 +1,13 @@
 
 TARGET ?= linux-amd64
 
-JAVA_HOME ?= /usr/local/jdk-13+33
+JAVA_HOME ?= /usr/local/jdk
 
-JAVAC ?= javac
-JAR ?= jar
-JMOD ?= jmod
+JAVAC ?= $(JAVA_HOME)/bin/javac
+JAR ?= $(JAVA_HOME)/bin/jar
+JMOD ?= $(JAVA_HOME)/bin/jmod
 
-JAVACFLAGS += -source 13
+JAVACFLAGS +=
 
 # Linux options
 linux-amd64_CPPFLAGS = \