summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-09-15 17:30:22 +0000
committerpaltherr <paltherr@epfl.ch>2004-09-15 17:30:22 +0000
commit246717e05e78a60bd1ced8d806eeb3d8f8455f90 (patch)
treecf6d1b3a4fae2fc5afd563939f22d36192b87c30
parent5f09d8f587efd305fae640a89ba97b9319d90db4 (diff)
downloadscala-246717e05e78a60bd1ced8d806eeb3d8f8455f90.tar.gz
scala-246717e05e78a60bd1ced8d806eeb3d8f8455f90.tar.bz2
scala-246717e05e78a60bd1ced8d806eeb3d8f8455f90.zip
- Updated to new wrapper
-rw-r--r--Makefile.distrib7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.distrib b/Makefile.distrib
index 63c6d3b1c6..960b54f1fa 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -75,12 +75,15 @@ install : $(TOOLS_JAR_ARCHIVE)
SCRIPTS_PREFIX=$(INSTALL_BINDIR) \
INSTALL_PREFIX=$(INSTALL_PREFIX) \
MACRO_VERSION=$(INSTALL_VERSION) \
- MACRO_RUNTIME_SOURCES=$(INSTALL_SRCDIR) \
- MACRO_RUNTIME_CLASSES=$(INSTALL_RUNTIME_JARFILE) \
+ MACRO_LIBRARY_SOURCES=$(INSTALL_SRCDIR) \
+ MACRO_LIBRARY_CLASSES=$(INSTALL_RUNTIME_JARFILE) \
MACRO_TOOLS_CLASSES=$(INSTALL_TOOLS_JARFILE) \
MACRO_FJBG_CLASSES=$(INSTALL_FJBG_JARFILE) \
MACRO_MSIL_CLASSES=$(INSTALL_MSIL_JARFILE) \
+ MACRO_JAVA_CMD=java \
MACRO_JAVA_ARGS= \
+ MACRO_SCALA_CMD=$(INSTALL_BINDIR)/scala \
+ MACRO_SCALA_ARGS= \
scripts
$(CHMOD) u+w $(INSTALL_BINDIR)/$(SCRIPTS_WRAPPER_NAME)
$(RM) $(INSTALL_BINDIR)/$(SCRIPTS_TEMPLATE_NAME)