summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-09-21 15:18:25 +0000
committerpaltherr <paltherr@epfl.ch>2004-09-21 15:18:25 +0000
commit225d4cca51bde75bebb1f0887aa4f8bbde7dcf60 (patch)
treeb7441163e57c5349d95ea558d2389e366b3299c8 /Makefile
parent3cf459cf6aeeb9e62be7324a6b0e784c176c0875 (diff)
downloadscala-225d4cca51bde75bebb1f0887aa4f8bbde7dcf60.tar.gz
scala-225d4cca51bde75bebb1f0887aa4f8bbde7dcf60.tar.bz2
scala-225d4cca51bde75bebb1f0887aa4f8bbde7dcf60.zip
- Removed PROJECT_APIDOCDIR (api doc is now gen...
- Removed PROJECT_APIDOCDIR (api doc is now generated under PROJECT_OBJECTDIR)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6d74789e97..e78133d6d6 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,6 @@ fastclean :
clean :
$(RM) -r $(main_OBJECTDIR)
- $(RM) -r $(PROJECT_APIDOCDIR)
distclean :
$(RM) $(LATEST_PREFIX)-*
@@ -405,7 +404,7 @@ LIBRARY_SC_CLASSPATH = $(LIBRARY_JC_CLASSPATH):$(PROJECT_SOURCEDIR)
LIBRARY_SDC_FLAGS += -windowtitle "Scala Library Documentation"
LIBRARY_SDC_FLAGS += -doctitle "Scala<br/>$(PROJECT_VERSION)"
LIBRARY_SDC_FILES += $(LIBRARY_SC_FILES)
-LIBRARY_SDC_OUTPUTDIR = $(PROJECT_APIDOCDIR)
+LIBRARY_SDC_OUTPUTDIR = $($(prefix)_OBJECTDIR)/doc/api
LIBRARY_JAR_ARCHIVE = $(LIBRARY_CLASSDIR).jar
LIBRARY_JAR_INPUTDIR = $(LIBRARY_CLASSDIR)
LIBRARY_JAR_FILES += .