diff options
| author | paltherr <paltherr@epfl.ch> | 2004-09-21 12:58:44 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-09-21 12:58:44 +0000 |
| commit | 364ef1fd07b288394d3f214343568aecd06a02ea (patch) | |
| tree | f92e9ce0ed477a4ee526b9eccb4312184c4f225b | |
| parent | cbf71d88fd2a0c1a8c8e1f34294bef0646ec27ab (diff) | |
| download | scala-364ef1fd07b288394d3f214343568aecd06a02ea.tar.gz scala-364ef1fd07b288394d3f214343568aecd06a02ea.tar.bz2 scala-364ef1fd07b288394d3f214343568aecd06a02ea.zip | |
- Added MACRO_TEST_SRCDIR and MACRO_TEST_OBJDIR
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.distrib | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -320,6 +320,8 @@ $(SCRIPTS_WRAPPER_FILE) : MACRO_JAVA_CMD ?= java $(SCRIPTS_WRAPPER_FILE) : MACRO_JAVA_ARGS ?= -enableassertions $(SCRIPTS_WRAPPER_FILE) : MACRO_SCALA_CMD ?= $($(prefix)_SCALA_CMD) $(SCRIPTS_WRAPPER_FILE) : MACRO_SCALA_ARGS ?= +$(SCRIPTS_WRAPPER_FILE) : MACRO_TEST_SRCDIR ?= $(PROJECT_TESTDIR) +$(SCRIPTS_WRAPPER_FILE) : MACRO_TEST_OBJDIR ?= "" $(SCRIPTS_WRAPPER_FILE) : $(VERSION_FILE) $(SCRIPTS_WRAPPER_FILE) : $(PROJECT_ROOT)/Makefile $(SCRIPTS_WRAPPER_FILE) : $(PROJECT_ROOT)/Makefile.config @@ -340,6 +342,8 @@ $(SCRIPTS_WRAPPER_FILE) : $(SCRIPTS_TEMPLATE_FILE) $(call SCRIPTS_MACRO,JAVA_ARGS) \ $(call SCRIPTS_MACRO,SCALA_CMD) \ $(call SCRIPTS_MACRO,SCALA_ARGS) \ + $(call SCRIPTS_MACRO,TEST_SRCDIR) \ + $(call SCRIPTS_MACRO,TEST_OBJDIR) \ $(SCRIPTS_TEMPLATE_FILE) > $@ @macros=`$(SED) -n -es'@.*{#\(.*\)#}.*@\1@p' < $@`; \ if [ -n "$$macros" ]; then \ diff --git a/Makefile.distrib b/Makefile.distrib index 5ff0fa0f21..ca4280e753 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -84,6 +84,8 @@ install : $(TOOLS_JAR_ARCHIVE) MACRO_JAVA_ARGS= \ MACRO_SCALA_CMD=$(INSTALL_BINDIR)/scala \ MACRO_SCALA_ARGS= \ + MACRO_TEST_SRCDIR=$(INSTALL_TESTDIR) \ + MACRO_TEST_OBJDIR="/tmp/$$PRODUCT" \ scripts $(CHMOD) u+w $(INSTALL_BINDIR)/$(SCRIPTS_WRAPPER_NAME) $(RM) $(INSTALL_BINDIR)/$(SCRIPTS_TEMPLATE_NAME) |