summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2005-10-07 09:25:38 +0000
committermichelou <michelou@epfl.ch>2005-10-07 09:25:38 +0000
commit32cabb1c30d55354847bb92bdaa41a7ff2763679 (patch)
tree121e58afa39ec98ac824fad68f3a7db3f49a6196
parent5da73c7fd8220445e8dab8d7eefe90a9c27165ba (diff)
downloadscala-32cabb1c30d55354847bb92bdaa41a7ff2763679.tar.gz
scala-32cabb1c30d55354847bb92bdaa41a7ff2763679.tar.bz2
scala-32cabb1c30d55354847bb92bdaa41a7ff2763679.zip
- added user name to the created temporary dire...
- added user name to the created temporary directories (nsc).
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 17b7332e5b..b754cefbad 100644
--- a/Makefile
+++ b/Makefile
@@ -630,7 +630,7 @@ $(latest)scalac-sc : $(SCALAC_SC_FILES)
NTOOLS_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/nsc
NTOOLS_LIST += $(call READLIST,$(PROJECT_LISTDIR)/nsc.lst)
-NTOOLS_OUTPUTDIR = /tmp/classes_$(NTOOLS_JAR_NAME)
+NTOOLS_OUTPUTDIR = /tmp/classes_$(NTOOLS_JAR_NAME)_$(USER)
NTOOLS_OBJECTDIR = $(PROJECT_OBJECTDIR)/nsc/lib
NTOOLS_SOURCES += $(NTOOLS_LIST:%=$(NTOOLS_ROOT)/%)
NTOOLS_SC_FILES += $(filter %.scala,$(NTOOLS_SOURCES))
@@ -690,7 +690,7 @@ endif
NLIBRARY_ROOT = $(PROJECT_SOURCEDIR)/scala
NLIBRARY_LIST += $(call READLIST,$(PROJECT_LISTDIR)/library-nsc.lst)
-NLIBRARY_OUTPUTDIR = /tmp/classes_$(NLIBRARY_JAR_NAME)
+NLIBRARY_OUTPUTDIR = /tmp/classes_$(NLIBRARY_JAR_NAME)_$(USER)
NLIBRARY_OBJECTDIR = $(PROJECT_OBJECTDIR)/nsc/lib
NLIBRARY_SOURCES += $(NLIBRARY_LIST:%=$(NLIBRARY_ROOT)/%)
NLIBRARY_JC_FILES += $(filter %.java,$(NLIBRARY_SOURCES))
@@ -860,7 +860,7 @@ $(latest)scala4ant-sc : $(SCALA4ANT_SC_FILES)
PROJECT_SOURCES += $(SCALA4ANT_SOURCES)
NSC4ANT_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scala4ant
-NSC4ANT_OUTPUTDIR = /tmp/classes_$(NSC4ANT_JAR_NAME)
+NSC4ANT_OUTPUTDIR = /tmp/classes_$(NSC4ANT_JAR_NAME)_$(USER)
NSC4ANT_OBJECTDIR = $(PROJECT_OBJECTDIR)/nsc/lib
NSC4ANT_LIST += NscAdaptor.scala
NSC4ANT_LIST += NscTask.scala