diff -r 71c04702a3d5 -r 72e3ae9a25eb make/nashorn/project.properties
--- a/make/nashorn/project.properties	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/nashorn/project.properties	Tue Sep 12 19:03:56 2017 +0200
@@ -24,11 +24,11 @@
 application.title=nashorn
 
 # location of JDK embedded ASM sources
-jdk.java.base.dir=../jdk/src/java.base/share/classes
+jdk.java.base.dir=src/java.base/share/classes
 jdk.asm.src.dir=${jdk.java.base.dir}/jdk/internal/org/objectweb/asm
 
 # location of JDK embedded jline sources
-jdk.jline.src.dir=../jdk/src/jdk.internal.le/share/classes
+jdk.jline.src.dir=src/jdk.internal.le/share/classes
 
 # source and target levels
 build.compiler=modern
@@ -45,8 +45,11 @@
 nashorn.fullversion=0.1
 nashorn.product.name=Oracle Nashorn
 
+jdk.build.dir=build
+nashorn.make.dir=make/nashorn
+
 # This directory is removed when the project is cleaned:
-build.dir=build
+build.dir=${jdk.build.dir}/nashorn
 build.classes.dir=${build.dir}/classes
 build.zip=${build.dir}/nashorn.zip
 build.gzip=${build.dir}/nashorn.tar.gz
@@ -85,7 +88,7 @@
 build.nooptimistic.test.results.dir=${build.dir}/test/nooptimistic/reports
 
 # This directory is removed when the project is cleaned:
-dist.dir=dist
+dist.dir=build/nashorn/dist
 dynalink.jar=${dist.dir}/dynalink.jar
 nashorn.jar=${dist.dir}/nashorn.jar
 jjs.jar=${dist.dir}/jjs.jar
@@ -97,7 +100,7 @@
 run.test.jvmargs.jfr=-XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:FlightRecorderOptions=defaultrecording=true,disk=true,dumponexit=true,dumponexitpath=${build.dir},stackdepth=128
 
 # test library location
-test.lib=${basedir}${file.separator}test${file.separator}lib
+test.lib=test/nashorn/lib
 
 # jars refererred
 file.reference.testng.jar=${test.lib}${file.separator}testng-6.8.jar
@@ -165,15 +168,15 @@
     ${build.classes.dir}
 
 # test scripts to run
-test.dir=test
-test.nosecurity.dir=test/script/nosecurity
-test.script.dir=test/script
-test.basic.dir=test/script/basic
-test.maptests.dir=test/script/maptests
-test.error.dir=test/script/error
-test.sandbox.dir=test/script/sandbox
-test.trusted.dir=test/script/trusted
-test.external.dir=test/script/external
+test.dir=test/nashorn
+test.nosecurity.dir=${test.dir}/script/nosecurity
+test.script.dir=${test.dir}/script
+test.basic.dir=${test.script.dir}/basic
+test.maptests.dir=${test.script.dir}/maptests
+test.error.dir=${test.script.dir}/error
+test.sandbox.dir=${test.script.dir}/sandbox
+test.trusted.dir=${test.script.dir}/trusted
+test.external.dir=${test.script.dir}/external
 test262.dir=${test.external.dir}/test262
 test262.suite.dir=${test262.dir}/test/suite
 testjfx.dir=${test.script.dir}/jfx
@@ -337,7 +340,7 @@
         ${nashorn.shell.module.src.dir}${path.separator}\
         ${jdk.jline.src.dir}
 
-test.src.dir=test/src
+test.src.dir=test/nashorn/src
 
 # -Xmx is used for all tests, -Xms only for octane benchmark
 run.test.xmx=2G
@@ -470,11 +473,11 @@
 
 #naming of CC results
 #NB directory specified in the cc.dir will be cleaned up!!!
-cc.dir=${basedir}/../Codecoverage_Nashorn
+cc.dir=${build.dir}/Codecoverage_Nashorn
 cc.result.file.name=CC_${jcov}_nashorn.xml
 
 #dynamic CC parameters; please redefine in the ${user.home}/.nashorn.project.local.properties
-jcov2.lib.dir=${basedir}/../jcov2/lib
+jcov2.lib.dir=${build.dir}/jcov2/lib
 jcov.jar=${jcov2.lib.dir}/jcov.jar
 cc.include=jdk\.nashorn\.*
 cc.exclude=jdk\.nashorn\.internal\.scripts\.*