From 5c34a951da5da364e9ea442a011cd912b79d4281 Mon Sep 17 00:00:00 2001 From: paltherr Date: Fri, 21 Nov 2003 14:40:14 +0000 Subject: - Fixed SCALAC_SCALAC & LIBRARY_SCALAC --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 41a9d2311a..1018c6c634 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ SCALAC_JC_FILES += $(SCALACBOOT_SOURCES) SCALAC_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(MSIL_JARFILE):$(FJBG_JARFILE) SCALAC_SC_FILES += $(SCALAC_SOURCES) SCALAC_SC_CLASSPATH = $(SCALAC_JC_CLASSPATH) -SCALAC_SCALAC = $(SCALAC:$(PROJECT_ROOT)%=$(PROJECT_BOOTSTRAPDIR)%)boot +SCALAC_SCALAC = $(LIBRARY_SCALAC) # scala library LIBRARY_ROOT = $(PROJECT_SOURCEDIR)/scala @@ -97,7 +97,7 @@ LIBRARY_SDC_OUTPUTDIR = $(PROJECT_APIDOCDIR) LIBRARY_JAR_ARCHIVE = $(PROJECT_LIBRARYDIR)/$(PROJECT_NAME).jar LIBRARY_JAR_INPUTDIR = $(PROJECT_OUTPUTDIR) LIBRARY_JAR_FILES += scala -LIBRARY_SCALAC = $(if $(boot),$(SCALAC)boot,$(SCALAC_SCALAC)) +LIBRARY_SCALAC = $(PROJECT_BOOTSTRAPDIR)/bin/scalacboot # scala interpreter INTERPRETER_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scalai -- cgit v1.2.3