summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.xml1
-rw-r--r--src/scalap/decoder.properties (renamed from src/scalap/scala/tools/scalap/decoder.properties)0
-rw-r--r--src/scalap/scala/tools/scalap/Properties.scala2
3 files changed, 2 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index af763d9b8f..54ab585eff 100644
--- a/build.xml
+++ b/build.xml
@@ -692,6 +692,7 @@ PACKED QUICK BUILD (PACK)
<mkdir dir="${build-pack.dir}/lib"/>
<jar destfile="${build-pack.dir}/lib/scalap.jar">
<fileset dir="${build-quick.dir}/classes/scalap"/>
+ <fileset file="${src.dir}/scalap/decoder.properties"/>
</jar>
</target>
diff --git a/src/scalap/scala/tools/scalap/decoder.properties b/src/scalap/decoder.properties
index 2aeb55400c..2aeb55400c 100644
--- a/src/scalap/scala/tools/scalap/decoder.properties
+++ b/src/scalap/decoder.properties
diff --git a/src/scalap/scala/tools/scalap/Properties.scala b/src/scalap/scala/tools/scalap/Properties.scala
index 0be23d351d..302b0ec463 100644
--- a/src/scalap/scala/tools/scalap/Properties.scala
+++ b/src/scalap/scala/tools/scalap/Properties.scala
@@ -15,7 +15,7 @@ package scala.tools.scalap
object Properties {
/** The name of the properties file */
- private val propFilename = "decoder.properties"
+ private val propFilename = "/decoder.properties"
/** The loaded properties */
private val props = {