diff options
| author | paltherr <paltherr@epfl.ch> | 2003-08-11 08:07:46 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-08-11 08:07:46 +0000 |
| commit | 6e5ee797783ff13bf50c90d99f30bf3e1aacc0fe (patch) | |
| tree | 68f8a747d6d92d349bc16e32f15a584c2b990284 | |
| parent | 5893d5b55b0b1d343c56743566789007ad4cd6a6 (diff) | |
| download | scala-6e5ee797783ff13bf50c90d99f30bf3e1aacc0fe.tar.gz scala-6e5ee797783ff13bf50c90d99f30bf3e1aacc0fe.tar.bz2 scala-6e5ee797783ff13bf50c90d99f30bf3e1aacc0fe.zip | |
- Renamed apidir to apidocdir
- Added removal of apidocdir on distclean
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.config | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -88,7 +88,7 @@ LIBRARY_SOURCES += $(LIBRARY_LIST:%=$(LIBRARY_ROOT)/%) LIBRARY_JC_FILES += $(filter %.java,$(LIBRARY_SOURCES)) LIBRARY_SC_FILES += $(filter %.scala,$(LIBRARY_SOURCES)) LIBRARY_SDC_FILES += $(LIBRARY_SC_FILES) -LIBRARY_SDC_OUTPUTDIR = $(PROJECT_APIDIR) +LIBRARY_SDC_OUTPUTDIR = $(PROJECT_APIDOCDIR) # scala interpreter INTERPRETER_ROOT = $(PROJECT_SOURCEDIR)/scalai @@ -156,6 +156,7 @@ distclean : clean $(RM) $(SCRIPTS_WRAPPER) $(RM) $(PROJECT_JAR_ARCHIVE) $(RM) $(ROOT)/support/latex/*.class + $(RM) -r $(PROJECT_APIDOCDIR) scripts : $(SCRIPTS_WRAPPER_LINKS) lamplib : .latest-lamplib diff --git a/Makefile.config b/Makefile.config index b9a2c5dcd0..25e68a0ce8 100644 --- a/Makefile.config +++ b/Makefile.config @@ -22,7 +22,7 @@ PROJECT_SOURCEDIR ?= $(PROJECT_ROOT)/sources PROJECT_OUTPUTDIR ?= $(PROJECT_ROOT)/classes PROJECT_CLASSPATH ?= $(PROJECT_OUTPUTDIR) PROJECT_LISTDIR ?= $(PROJECT_CONFIGDIR)/list -PROJECT_APIDIR ?= $(PROJECT_DOCUMENTDIR)/api +PROJECT_APIDOCDIR ?= $(PROJECT_DOCUMENTDIR)/api ############################################################################## # External libraries |