diff options
-rw-r--r-- | Mk/bsd.java.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index a1641a4f8743..dccdc3b71345 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -330,6 +330,16 @@ check-makevars:: @${FALSE} . endif +# Set default values for JAVA_BUILD and JAVA_RUN +# When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre +# (unless NO_BUILD is set) +. if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN) +. if !defined(NO_BUILD) +JAVA_BUILD= jdk +. endif +JAVA_RUN= jre +. endif + # JDK dependency setting . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE @@ -444,14 +454,6 @@ JAVA_BUILD= jdk # Add the JDK port to the dependencies DEPEND_JAVA= ${JAVA}:${PORTSDIR}/${JAVA_PORT} -# When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre -# (unless NO_BUILD is set) -. if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN) -. if !defined(NO_BUILD) -JAVA_BUILD= jdk -. endif -JAVA_RUN= jre -. endif . if defined(JAVA_EXTRACT) EXTRACT_DEPENDS+= ${DEPEND_JAVA} . endif |