summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2003-10-17 15:00:31 +0000
committermichelou <michelou@epfl.ch>2003-10-17 15:00:31 +0000
commit2c1ac0cc2a4dd0a7ee8b8bd0ac8b7f38d700f3ff (patch)
tree687103bd054bcf14343089f6eb550357546bf9b9 /Makefile
parent2e5258021fabd15ebd10d5108821965aec97ac64 (diff)
downloadscala-2c1ac0cc2a4dd0a7ee8b8bd0ac8b7f38d700f3ff.tar.gz
scala-2c1ac0cc2a4dd0a7ee8b8bd0ac8b7f38d700f3ff.tar.bz2
scala-2c1ac0cc2a4dd0a7ee8b8bd0ac8b7f38d700f3ff.zip
- moved scaladoc into scala.tools package
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index d82ac284b7..609ce921e5 100644
--- a/Makefile
+++ b/Makefile
@@ -100,13 +100,13 @@ INTERPRETER_SOURCES += $(INTERPRETER_LIST:%=$(INTERPRETER_ROOT)/%)
INTERPRETER_JC_FILES = $(INTERPRETER_SOURCES)
# scaladoc
-SCALADOC_ROOT = $(PROJECT_SOURCEDIR)/scaladoc
+SCALADOC_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scaladoc
SCALADOC_LIST = $(call READLIST,$(PROJECT_LISTDIR)/scaladoc.lst)
SCALADOC_SOURCES += $(SCALADOC_LIST:%=$(SCALADOC_ROOT)/%)
SCALADOC_JC_FILES = $(SCALADOC_SOURCES)
SCALADOC_RSRC_LIST = resources/style.css resources/script.js
SCALADOC_RSRC_FILES += $(SCALADOC_RSRC_LIST:%=$(SCALADOC_ROOT)/%)
-SCALADOC_RSRC_OUTPUTDIR = $(PROJECT_OUTPUTDIR)/scaladoc
+SCALADOC_RSRC_OUTPUTDIR = $(PROJECT_OUTPUTDIR)/scala/tools/scaladoc
# dtd2scala
DTD2SCALA_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/dtd2scala
@@ -132,7 +132,7 @@ TOOLS_JAR_ARCHIVE = $(PROJECT_LIBRARYDIR)/$(TOOLS_NAME).jar
TOOLS_JAR_INPUTDIR = $(PROJECT_OUTPUTDIR)
TOOLS_JAR_FILES += ch
TOOLS_JAR_FILES += scalac
-TOOLS_JAR_FILES += scaladoc
+TOOLS_JAR_FILES += scala/tools/scaladoc
TOOLS_JAR_FILES += scalai
TOOLS_JAR_FILES += scala/tools/dtd2scala
TOOLS_JAR_FILES += scalap