diff options
| author | paltherr <paltherr@epfl.ch> | 2004-09-21 15:18:25 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-09-21 15:18:25 +0000 |
| commit | 225d4cca51bde75bebb1f0887aa4f8bbde7dcf60 (patch) | |
| tree | b7441163e57c5349d95ea558d2389e366b3299c8 | |
| parent | 3cf459cf6aeeb9e62be7324a6b0e784c176c0875 (diff) | |
| download | scala-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)
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.config | 1 | ||||
| -rw-r--r-- | doc/.cvsignore | 1 |
3 files changed, 1 insertions, 4 deletions
@@ -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 += . diff --git a/Makefile.config b/Makefile.config index b8e81b660f..8c3d1507ff 100644 --- a/Makefile.config +++ b/Makefile.config @@ -26,7 +26,6 @@ PROJECT_HTDOCSDIR ?= $(PROJECT_WEBSITEDIR)/htdocs PROJECT_DISTRIBDIR ?= $(PROJECT_ROOT)/distribs PROJECT_ARCHIVEDIR ?= $(PROJECT_DISTRIBDIR) PROJECT_LISTDIR ?= $(PROJECT_CONFIGDIR)/list -PROJECT_APIDOCDIR ?= $(PROJECT_DOCUMENTDIR)/api ############################################################################## # External libraries diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index eedd89b455..0000000000 --- a/doc/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -api |