summaryrefslogtreecommitdiff
path: root/Makefile.distrib
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-01-19 17:37:06 +0000
committerpaltherr <paltherr@epfl.ch>2004-01-19 17:37:06 +0000
commit79fca2669850decea6800bde7adffc17a7c3101a (patch)
tree62693167df2c7655d7b212f578a13b47079b60d0 /Makefile.distrib
parent0572255cf16731a121fae93734057f539e783e08 (diff)
downloadscala-79fca2669850decea6800bde7adffc17a7c3101a.tar.gz
scala-79fca2669850decea6800bde7adffc17a7c3101a.tar.bz2
scala-79fca2669850decea6800bde7adffc17a7c3101a.zip
- Fixed paths to test files
Diffstat (limited to 'Makefile.distrib')
-rw-r--r--Makefile.distrib30
1 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.distrib b/Makefile.distrib
index 3e8bb45530..7b9f49a6a6 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -30,7 +30,7 @@ ULTRAEDIT_LIST += scala.txt
ULTRAEDIT_FILES = $(ULTRAEDIT_LIST:%=$(ULTRAEDIT_ROOT)/%)
# scala test
-TEST_ROOT = $(PROJECT_ROOT)/test/files
+TEST_ROOT = $(PROJECT_ROOT)/test
TEST_LIST += $(call READLIST,$(PROJECT_LISTDIR)/test-pos.lst)
TEST_LIST += $(call READLIST,$(PROJECT_LISTDIR)/test-neg.lst)
TEST_LIST += $(call READLIST,$(PROJECT_LISTDIR)/test-run.lst)
@@ -116,20 +116,20 @@ install : $(TOOLS_JAR_ARCHIVE)
$(INSTALL) -m 755 -d $(INSTALL_TESTDIR)
$(INSTALL) -m 755 -d $(INSTALL_TESTDIR)/bin
$(INSTALL) -m 755 $(TEST_ROOT)/bin/scala-test $(INSTALL_TESTDIR)/bin
- $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) $(TEST_LIST) \
- $(INSTALL_TESTDIR))
- $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
- $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.check) 2>/dev/null) \
- $(INSTALL_TESTDIR))
- $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
- $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.flags) 2>/dev/null) \
- $(INSTALL_TESTDIR))
- $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
- $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.dtd) 2>/dev/null) \
- $(INSTALL_TESTDIR))
- $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
- $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \
- $(INSTALL_TESTDIR))
+ $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files $(TEST_LIST) \
+ $(INSTALL_TESTDIR)/files)
+ $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
+ $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.check) 2>/dev/null) \
+ $(INSTALL_TESTDIR)/files)
+ $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
+ $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.flags) 2>/dev/null) \
+ $(INSTALL_TESTDIR)/files)
+ $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
+ $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.dtd) 2>/dev/null) \
+ $(INSTALL_TESTDIR)/files)
+ $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
+ $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \
+ $(INSTALL_TESTDIR)/files)
install-windows : install
@if [ ! -d "$(INSTALL_PREFIX)" ]; then \