From 0eda792139bb3820c7abac1ff9e90e8216ec390a Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Fri, 26 May 2017 15:06:14 +0200
Subject: [PATCH 1/2] Fix dotd to use java classpath

---
 dist/bin/dotd | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dist/bin/dotd b/dist/bin/dotd
index 8196f3354475..7c1d80cd28ca 100755
--- a/dist/bin/dotd
+++ b/dist/bin/dotd
@@ -75,4 +75,10 @@ CLASS_PATH="$CLASS_PATH$PSEP$SNAKEYAML_LIB"
 CLASS_PATH="$CLASS_PATH$PSEP$ST4_LIB"
 CLASS_PATH="$CLASS_PATH$PSEP$JSOUP_LIB"
 
-eval exec "\"$JAVACMD\"" $CLASS_PATH dotty.tools.dottydoc.Main $@
+eval exec "\"$JAVACMD\"" \
+    -Dscala.usejavacp=true \
+    $CLASS_PATH \
+    dotty.tools.dottydoc.Main \
+    $@
+
+exit $?

From 988fb01a4e5f705bc4ecbcd6afb9a693480a7ed4 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Fri, 26 May 2017 15:18:43 +0200
Subject: [PATCH 2/2] Remove cwd from classpath in dotd script

---
 dist/bin/dotd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/bin/dotd b/dist/bin/dotd
index 7c1d80cd28ca..b6b528991032 100755
--- a/dist/bin/dotd
+++ b/dist/bin/dotd
@@ -64,7 +64,7 @@ for filename in $PROG_HOME/lib/*.jar; do
   [[ $filename =~ /jsoup.*.jar ]] && JSOUP_LIB=$filename
 done
 
-CLASS_PATH="-classpath .$PSEP$DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF"
+CLASS_PATH="-classpath $DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF"
 CLASS_PATH="$CLASS_PATH$PSEP$SCALA_LIB"
 CLASS_PATH="$CLASS_PATH$PSEP$FLEXMARK_LIBS"
 CLASS_PATH="$CLASS_PATH$PSEP$JACKSON_LIBS"