- changed directory structure of the Scala dist...

- changed directory structure of the Scala distribution.

1 files changed, 28 insertions, 27 deletions

diff --git a/Makefile.distrib b/Makefile.distrib
index bf82142688..9cd87d1bb2 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -55,12 +55,12 @@ ULTRAEDIT_LIST		+= README
 ULTRAEDIT_FILES		 = $(ULTRAEDIT_LIST:%=$(ULTRAEDIT_ROOT)/%)
 
 # scala man pages
-MANPAGES_ROOT		 = $(PROJECT_SUPPORTDIR)/man
-MANPAGES_LIST		+= man1/scala.1
-MANPAGES_LIST		+= man1/scalac.1
-MANPAGES_LIST		+= man1/scaladoc.1
-MANPAGES_LIST		+= man1/scalaint.1
-MANPAGES_LIST		+= man1/scalarun.1
+MANPAGES_ROOT		 = $(PROJECT_SUPPORTDIR)/man/man1
+MANPAGES_LIST		+= scala.1
+MANPAGES_LIST		+= scalac.1
+MANPAGES_LIST		+= scaladoc.1
+MANPAGES_LIST		+= scalaint.1
+MANPAGES_LIST		+= scalarun.1
 MANPAGES_FILES		 = $(MANPAGES_LIST:%=$(MANPAGES_ROOT)/%)
 
 # scala test
@@ -82,13 +82,16 @@ INSTALL_VERSION		:= $(shell $(DATE) -u "+%Y%m%d-%H%M%S")
 INSTALL_PACKAGE		 = $(PROJECT_NAME)-$(INSTALL_VERSION)
 INSTALL_PREFIX		 = $(INSTALL_ROOT)/$(INSTALL_PACKAGE)
 INSTALL_BINDIR		 = $(INSTALL_PREFIX)/bin
-INSTALL_DOCDIR		 = $(INSTALL_PREFIX)/doc
+INSTALL_SHAREDIR	 = $(INSTALL_PREFIX)/share
+INSTALL_SRCDIR		 = $(INSTALL_PREFIX)/src/$(INSTALL_PACKAGE)
+INSTALL_MANDIR		 = $(INSTALL_SHAREDIR)/man/man1
+INSTALL_DOCDIR		 = $(INSTALL_SHAREDIR)/doc/$(INSTALL_PACKAGE)
+INSTALL_PACKAGEDIR	 = $(INSTALL_SHAREDIR)/$(INSTALL_PACKAGE)
+INSTALL_LIBDIR		 = $(INSTALL_PACKAGEDIR)/lib
+INSTALL_SUPPORTDIR	 = $(INSTALL_PACKAGEDIR)/support
+INSTALL_TESTDIR		 = $(INSTALL_PACKAGEDIR)/test
 INSTALL_APIDOCDIR	 = $(INSTALL_DOCDIR)/api
-INSTALL_LIBDIR		 = $(INSTALL_PREFIX)/lib
-INSTALL_SRCDIR		 = $(INSTALL_PREFIX)/src
-INSTALL_EXAMPLEDIR	 = $(INSTALL_PREFIX)/examples
-INSTALL_SUPPORTDIR	 = $(INSTALL_PREFIX)/support
-INSTALL_TESTDIR		 = $(INSTALL_PREFIX)/test
+INSTALL_EXAMPLEDIR	 = $(INSTALL_DOCDIR)/examples
 
 INSTALL_LIBRARY_JARFILE	 = $(INSTALL_LIBDIR)/$(LIBRARY_NAME).jar
 INSTALL_TOOLS_JARFILE	 = $(INSTALL_LIBDIR)/$(TOOLS_NAME).jar
@@ -100,11 +103,11 @@ install			: $(LIBRARY_JAR_ARCHIVE)
 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_DOCDIR)
+	$(INSTALL) -m 644 -p $(PROJECT_ROOT)/README $(INSTALL_DOCDIR)
+	$(INSTALL) -m 644 -p $(PROJECT_ROOT)/LICENSE $(INSTALL_DOCDIR)
+	$(ECHO) $(INSTALL_VERSION) > $(INSTALL_DOCDIR)/VERSION
+	$(CHMOD) 644 $(INSTALL_DOCDIR)/VERSION
 	$(INSTALL) -m 755 -d $(INSTALL_BINDIR)
 	$(INSTALL) -m 644 -p $(SCRIPTS_TEMPLATE_FILE) $(INSTALL_BINDIR)
 	@$(make) \
@@ -144,6 +147,9 @@ install			: $(TOOLS_JAR_ARCHIVE)
 	    PROJECT_SOURCEDIR=$(INSTALL_SRCDIR) \
 	    LIBRARY_SDC_OUTPUTDIR=$(INSTALL_APIDOCDIR) \
 	    sdc
+	$(INSTALL) -m 755 -d $(INSTALL_MANDIR)
+	$(INSTALL) -m 644 -p $(MANPAGES_FILES) $(INSTALL_MANDIR)
+	$(FIND) $(INSTALL_MANDIR) -type f -exec $(GZIP) -f "{}" ";"
 	$(INSTALL) -m 755 -d $(INSTALL_EXAMPLEDIR)
 	$(strip $(MIRROR) -m 644 -p -C $(EXAMPLES_ROOT) $(EXAMPLES_LIST) \
 	    $(INSTALL_EXAMPLEDIR))
@@ -166,11 +172,6 @@ install			: $(TOOLS_JAR_ARCHIVE)
 	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/ultraedit
 	$(strip $(MIRROR) -m 644 -p -C $(ULTRAEDIT_ROOT) $(ULTRAEDIT_LIST) \
 	    $(INSTALL_SUPPORTDIR)/ultraedit)
-	$(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/man
-	$(strip $(MIRROR) -m 644 -p -C $(MANPAGES_ROOT) $(MANPAGES_LIST) \
-	    $(INSTALL_SUPPORTDIR)/man)
-	$(FIND) $(INSTALL_SUPPORTDIR)/man -type f -exec $(GZIP) -f "{}" ";"
-
 	$(INSTALL) -m 755 -d $(INSTALL_TESTDIR)
 	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) $(TEST_LIST) \
 	    $(INSTALL_TESTDIR))
@@ -198,10 +199,10 @@ install-windows		: install
 	    echo "Could not find UNIX install '$(INSTALL_PREFIX)'"; \
 	    exit 1; \
 	fi
-	$(UNIX2DOS) $(INSTALL_PREFIX)/README
-	$(UNIX2DOS) $(INSTALL_PREFIX)/LICENSE
-	$(UNIX2DOS) $(INSTALL_PREFIX)/VERSION
-	$(TOUCH) $(INSTALL_PREFIX)/VERSION-$(INSTALL_VERSION)
+	$(UNIX2DOS) $(INSTALL_DOCDIR)/README
+	$(UNIX2DOS) $(INSTALL_DOCDIR)/LICENSE
+	$(UNIX2DOS) $(INSTALL_DOCDIR)/VERSION
+	$(TOUCH) $(INSTALL_DOCDIR)/VERSION-$(INSTALL_VERSION)
 	@root=`cd "$(INSTALL_PREFIX)"; pwd`; \
 	for name in "" $(SCRIPTS_ALIASES_NAMES); do \
 	    if [ -z "$$name" ]; then continue; fi; \
@@ -230,7 +231,7 @@ install-windows		: install
 	    nixfile="$(INSTALL_PREFIX)/bin/$$name"; \
 	    $(RM) "$$nixfile"; \
 	done
-	$(RM) $(INSTALL_PREFIX)/bin/.scala_wrapper
+#	$(RM) $(INSTALL_PREFIX)/bin/.scala_wrapper
 	$(FIND) $(INSTALL_SRCDIR) -type f -exec $(UNIX2DOS) "{}" ";"
 	$(FIND) $(INSTALL_APIDOCDIR) -type f -exec $(UNIX2DOS) "{}" ";"
 	$(FIND) $(INSTALL_EXAMPLEDIR) -type f -exec $(UNIX2DOS) "{}" ";"