diff options
| author | paltherr <paltherr@epfl.ch> | 2003-08-25 16:52:48 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-08-25 16:52:48 +0000 |
| commit | bc25825b4225820e17e5d64581fe70569f25d946 (patch) | |
| tree | a66f8b7ac53e871dea6fed016b065f7fd11b7568 /Makefile.distrib | |
| parent | c8f4c60282215a21e099b6b4a3018e585c986e40 (diff) | |
| download | scala-bc25825b4225820e17e5d64581fe70569f25d946.tar.gz scala-bc25825b4225820e17e5d64581fe70569f25d946.tar.bz2 scala-bc25825b4225820e17e5d64581fe70569f25d946.zip | |
- Updated to make work again
Diffstat (limited to 'Makefile.distrib')
| -rw-r--r-- | Makefile.distrib | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Makefile.distrib b/Makefile.distrib index f7afe8a1e4..b361dd56fb 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -5,8 +5,8 @@ # scala documents DOCUMENTS_ROOT = $(PROJECT_DOCUMENTDIR) -DOCUMENTS_FILES += $(DOCUMENTS_ROOT)/reference/reference.pdf -DOCUMENTS_FILES += $(DOCUMENTS_ROOT)/reference/examples.pdf +DOCUMENTS_FILES += $(DOCUMENTS_ROOT)/reference/ScalaReference.pdf +DOCUMENTS_FILES += $(DOCUMENTS_ROOT)/reference/ScalaByExample.pdf DOCUMENTS_FILES += $(DOCUMENTS_ROOT)/tutorial/tutorial.pdf # scala examples @@ -47,6 +47,7 @@ INSTALL_SUPPORTDIR = $(INSTALL_PREFIX)/support INSTALL_TESTDIR = $(INSTALL_PREFIX)/test INSTALL_RUNTIME_JARFILE = $(INSTALL_LIBDIR)/$(PROJECT_NAME).jar +INSTALL_TOOLS_JARFILE = $(INSTALL_LIBDIR)/$(TOOLS_NAME).jar INSTALL_FJBG_JARFILE = $(INSTALL_LIBDIR)/fjbg.jar INSTALL_MSIL_JARFILE = $(INSTALL_LIBDIR)/msil.jar INSTALL_BCEL_JARFILE = $(INSTALL_LIBDIR)/bcel.jar @@ -57,7 +58,8 @@ INSTALL_XERCES_LICENSE = $(INSTALL_LIBDIR)/xerces.LICENSE install-clean : $(RM) -r $(INSTALL_PREFIX) -install : $(PROJECT_JAR_ARCHIVE) +install : $(LIBRARY_JAR_ARCHIVE) +install : $(TOOLS_JAR_ARCHIVE) $(MAKE) -C $(DOCUMENTS_ROOT)/reference $(MAKE) -C $(DOCUMENTS_ROOT)/tutorial $(INSTALL) -m 755 -d $(INSTALL_PREFIX) @@ -69,7 +71,7 @@ install : $(PROJECT_JAR_ARCHIVE) MACRO_VERSION=$(INSTALL_VERSION) \ MACRO_RUNTIME_SOURCES=$(INSTALL_SRCDIR) \ MACRO_RUNTIME_CLASSES=$(INSTALL_RUNTIME_JARFILE) \ - MACRO_DTD2SCALA_CLASSES=$(INSTALL_LIBDIR) \ + MACRO_TOOLS_CLASSES=$(INSTALL_TOOLS_JARFILE) \ MACRO_BCEL_CLASSES=$(INSTALL_BCEL_JARFILE) \ MACRO_FJBG_CLASSES=$(INSTALL_FJBG_JARFILE) \ MACRO_MSIL_CLASSES=$(INSTALL_MSIL_JARFILE) \ @@ -81,11 +83,12 @@ install : $(PROJECT_JAR_ARCHIVE) $(INSTALL) -m 644 $(DOCUMENTS_FILES) $(INSTALL_DOCDIR) @$(make) \ target=LIBRARY \ - LIBRARY_SDC_FILES='$(subst $$,\$$$$,$(LIBRARY_SC_FILES))' \ + LIBRARY_SDC_FILES='$(subst $$,$$$$,$(LIBRARY_SC_FILES))' \ LIBRARY_SDC_OUTPUTDIR=$(INSTALL_APIDOCDIR) \ sdc $(INSTALL) -m 755 -d $(INSTALL_LIBDIR) - $(INSTALL) -m 644 $(PROJECT_JAR_ARCHIVE) $(INSTALL_RUNTIME_JARFILE) + $(INSTALL) -m 644 $(LIBRARY_JAR_ARCHIVE) $(INSTALL_RUNTIME_JARFILE) + $(INSTALL) -m 644 $(TOOLS_JAR_ARCHIVE) $(INSTALL_TOOLS_JARFILE) $(INSTALL) -m 644 $(FJBG_JARFILE) $(INSTALL_FJBG_JARFILE) $(INSTALL) -m 644 $(MSIL_JARFILE) $(INSTALL_MSIL_JARFILE) $(INSTALL) -m 644 $(BCEL_JARFILE) $(INSTALL_BCEL_JARFILE) @@ -116,6 +119,12 @@ install : $(PROJECT_JAR_ARCHIVE) $(strip $(MIRROR) -m 644 -C $(TEST_ROOT) \ $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.flags) 2>/dev/null) \ $(INSTALL_TESTDIR)) + $(strip $(MIRROR) -m 644 -C $(TEST_ROOT) \ + $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.dtd) 2>/dev/null) \ + $(INSTALL_TESTDIR)) + $(strip $(MIRROR) -m 644 -C $(TEST_ROOT) \ + $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \ + $(INSTALL_TESTDIR)) $(INSTALL) -m 644 $(PROJECT_ROOT)/README $(INSTALL_PREFIX) $(INSTALL) -m 644 $(PROJECT_ROOT)/LICENSE $(INSTALL_PREFIX) $(ECHO) $(INSTALL_VERSION) > $(INSTALL_PREFIX)/VERSION |