diff options
| author | paltherr <paltherr@epfl.ch> | 2003-10-08 16:21:37 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-10-08 16:21:37 +0000 |
| commit | 8ee55188d8c59c69924fb0a914adf645dc682fdf (patch) | |
| tree | 28beae60185fb6d8e76f77d517b9986eacb684b0 /Makefile.config | |
| parent | 66077bf0c6211cbdc0109195c7a28be82b0f4261 (diff) | |
| download | scala-8ee55188d8c59c69924fb0a914adf645dc682fdf.tar.gz scala-8ee55188d8c59c69924fb0a914adf645dc682fdf.tar.bz2 scala-8ee55188d8c59c69924fb0a914adf645dc682fdf.zip | |
- Added variable PROJECT_BOOTSTRAPDIR
- Moved variables SCALAC & SCALADOC from Makefile.config into Makefile
- Cleaned bootstrap code
Diffstat (limited to 'Makefile.config')
| -rw-r--r-- | Makefile.config | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.config b/Makefile.config index 84c59e591a..783b7a3449 100644 --- a/Makefile.config +++ b/Makefile.config @@ -21,6 +21,7 @@ PROJECT_LIBRARYDIR ?= $(PROJECT_ROOT)/lib PROJECT_SUPPORTDIR ?= $(PROJECT_ROOT)/support PROJECT_SOURCEDIR ?= $(PROJECT_ROOT)/sources PROJECT_OUTPUTDIR ?= $(PROJECT_ROOT)/classes +PROJECT_BOOTSTRAPDIR ?= $(PROJECT_ROOT)/bootstrap PROJECT_CLASSPATH ?= $(PROJECT_OUTPUTDIR) PROJECT_LISTDIR ?= $(PROJECT_CONFIGDIR)/list PROJECT_APIDOCDIR ?= $(PROJECT_DOCUMENTDIR)/api @@ -86,12 +87,6 @@ PICO ?= pico PICO_FLAGS ?= -make -source 1.4 ############################################################################## -# Scala compiler - -SCALAC ?= $(PROJECT_BINARYDIR)/scalac -SCALADOC ?= $(PROJECT_BINARYDIR)/scaladoc - -############################################################################## # Makefile functions RUN ?= $(ECHO) '$(1)'; $(1) || exit $$? |