From 647b103fd20caf65ea2c21223959c12f807b8998 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Fri, 27 Nov 2015 00:24:47 -0800
Subject: [PATCH] Build directory fix.

---
 .../com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
index abf34fa5..fa703e12 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
@@ -11,6 +11,7 @@ import com.beust.kobalt.maven.DepFactory
 import com.beust.kobalt.maven.FileDependency
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.maven.LocalRepo
+import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
 import com.beust.kobalt.misc.log
 import com.beust.kobalt.wrapper.ParentLastClassLoader
@@ -42,7 +43,11 @@ class KotlinCompiler @Inject constructor(val localRepo : LocalRepo,
                 log(1, "  Compiling ${info.sourceFiles.size} files")
             }
             val cp = compilerFirst(info.dependencies.map {it.jarFile.get()})
-            val outputDir = (info.directory ?: "") + info.outputDir
+            val outputDir = if (info.directory != null) {
+                KFiles.joinDir(info.directory, info.outputDir.path)
+            } else {
+                info.outputDir.path
+            }
             // kotlinc can accept a jar file as -d (which is super convenient) so only
             // create a directory if the output is not a jar file
             if (! outputDir.endsWith(".jar")) {