diff options
| author | paltherr <paltherr@epfl.ch> | 2003-08-27 13:35:58 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-08-27 13:35:58 +0000 |
| commit | 2fd58d0430d22b74b942cd6d3fe9bc433ac3aa08 (patch) | |
| tree | 1f2fa009f485ff281a962b58218175f22f9637ee /Makefile.distrib | |
| parent | 03a8443eea6b6b6a780264ca7c09bb0354ac8e44 (diff) | |
| download | scala-2fd58d0430d22b74b942cd6d3fe9bc433ac3aa08.tar.gz scala-2fd58d0430d22b74b942cd6d3fe9bc433ac3aa08.tar.bz2 scala-2fd58d0430d22b74b942cd6d3fe9bc433ac3aa08.zip | |
- Changed install code to use installed scalado...
- Changed install code to use installed scaladoc to generate api doc
Diffstat (limited to 'Makefile.distrib')
| -rw-r--r-- | Makefile.distrib | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Makefile.distrib b/Makefile.distrib index 2992989529..b5778cadb3 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -63,6 +63,10 @@ install : $(TOOLS_JAR_ARCHIVE) $(MAKE) -C $(DOCUMENTS_ROOT)/reference $(MAKE) -C $(DOCUMENTS_ROOT)/tutorial $(INSTALL) -m 755 -d $(INSTALL_PREFIX) + $(INSTALL) -m 644 -p $(PROJECT_ROOT)/README $(INSTALL_PREFIX) + $(INSTALL) -m 644 -p $(PROJECT_ROOT)/LICENSE $(INSTALL_PREFIX) + $(ECHO) $(INSTALL_VERSION) > $(INSTALL_PREFIX)/VERSION + $(CHMOD) 644 $(INSTALL_PREFIX)/VERSION $(INSTALL) -m 755 -d $(INSTALL_BINDIR) $(INSTALL) -m 644 -p $(SCRIPTS_WRAPPER).tmpl $(INSTALL_BINDIR) @$(make) \ @@ -79,13 +83,6 @@ install : $(TOOLS_JAR_ARCHIVE) MACRO_JAVA_ARGS= \ scripts $(RM) $(INSTALL_BINDIR)/$(notdir $(SCRIPTS_WRAPPER)).tmpl - $(INSTALL) -m 755 -d $(INSTALL_DOCDIR) - $(INSTALL) -m 644 -p $(DOCUMENTS_FILES) $(INSTALL_DOCDIR) - @$(make) \ - target=LIBRARY \ - LIBRARY_SDC_FILES='$(subst $$,$$$$,$(LIBRARY_SC_FILES))' \ - LIBRARY_SDC_OUTPUTDIR=$(INSTALL_APIDOCDIR) \ - sdc $(INSTALL) -m 755 -d $(INSTALL_LIBDIR) $(INSTALL) -m 644 -p $(LIBRARY_JAR_ARCHIVE) $(INSTALL_RUNTIME_JARFILE) $(INSTALL) -m 644 -p $(TOOLS_JAR_ARCHIVE) $(INSTALL_TOOLS_JARFILE) @@ -98,6 +95,15 @@ install : $(TOOLS_JAR_ARCHIVE) $(INSTALL) -m 755 -d $(INSTALL_SRCDIR) $(strip $(MIRROR) -m 644 -p -C $(LIBRARY_ROOT) $(LIBRARY_LIST:%='%') \ $(INSTALL_SRCDIR)/$(PROJECT_NAME)) + $(INSTALL) -m 755 -d $(INSTALL_DOCDIR) + $(INSTALL) -m 644 -p $(DOCUMENTS_FILES) $(INSTALL_DOCDIR) + $(INSTALL) -m 755 -d $(INSTALL_APIDOCDIR) + $(make) \ + target=LIBRARY \ + SCALADOC=$(INSTALL_BINDIR)/scaladoc \ + PROJECT_SOURCEDIR=$(INSTALL_SRCDIR) \ + LIBRARY_SDC_OUTPUTDIR=$(INSTALL_APIDOCDIR) \ + sdc $(INSTALL) -m 755 -d $(INSTALL_EXAMPLEDIR) $(strip $(MIRROR) -m 644 -p -C $(EXAMPLES_ROOT) $(EXAMPLES_LIST) \ $(INSTALL_EXAMPLEDIR)) @@ -125,10 +131,6 @@ install : $(TOOLS_JAR_ARCHIVE) $(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \ $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \ $(INSTALL_TESTDIR)) - $(INSTALL) -m 644 -p $(PROJECT_ROOT)/README $(INSTALL_PREFIX) - $(INSTALL) -m 644 -p $(PROJECT_ROOT)/LICENSE $(INSTALL_PREFIX) - $(ECHO) $(INSTALL_VERSION) > $(INSTALL_PREFIX)/VERSION - $(CHMOD) 644 $(INSTALL_PREFIX)/VERSION install-windows : @if [ ! -d "$(INSTALL_PREFIX)" ]; then \ |