summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-09-02 15:43:27 +0000
committerpaltherr <paltherr@epfl.ch>2003-09-02 15:43:27 +0000
commit155189bcfa95266320418b38992e46ea0d5140f0 (patch)
treeffdd4df024c34c9f0f658d79deb1974e27127c5e
parentfbb6cebf1dffff37067518b765cc2ee6e8d19a62 (diff)
downloadscala-155189bcfa95266320418b38992e46ea0d5140f0.tar.gz
scala-155189bcfa95266320418b38992e46ea0d5140f0.tar.bz2
scala-155189bcfa95266320418b38992e46ea0d5140f0.zip
- Added PROJECT_VERSION
-rw-r--r--Makefile2
-rw-r--r--Makefile.config1
-rw-r--r--Makefile.distrib1
3 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cc807fe19f..8ec4bc3298 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,7 @@ library-doc : .latest-library-sdc
# Rules
$(SCRIPTS_WRAPPER) : INSTALL_PREFIX ?= $(PROJECT_ROOT)
-$(SCRIPTS_WRAPPER) : MACRO_VERSION ?= development version
+$(SCRIPTS_WRAPPER) : MACRO_VERSION ?= $(PROJECT_VERSION)
$(SCRIPTS_WRAPPER) : MACRO_RUNTIME_SOURCES ?= $(PROJECT_SOURCEDIR)
$(SCRIPTS_WRAPPER) : MACRO_RUNTIME_CLASSES ?= $(PROJECT_OUTPUTDIR)
$(SCRIPTS_WRAPPER) : MACRO_TOOLS_CLASSES ?= $(PROJECT_OUTPUTDIR)
diff --git a/Makefile.config b/Makefile.config
index 3c33aa1af5..e16a2361a8 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -12,6 +12,7 @@
# Project setup
PROJECT_NAME ?= scala
+PROJECT_VERSION ?= development version
PROJECT_ROOT ?= $(ROOT)
PROJECT_BINARYDIR ?= $(PROJECT_ROOT)/bin
PROJECT_CONFIGDIR ?= $(PROJECT_ROOT)/config
diff --git a/Makefile.distrib b/Makefile.distrib
index 04b61306f4..9b08e8f20f 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -101,6 +101,7 @@ install : $(TOOLS_JAR_ARCHIVE)
@$(make) \
target=LIBRARY \
SCALADOC=$(INSTALL_BINDIR)/scaladoc \
+ PROJECT_VERSION=$(INSTALL_VERSION) \
PROJECT_SOURCEDIR=$(INSTALL_SRCDIR) \
LIBRARY_SDC_OUTPUTDIR=$(INSTALL_APIDOCDIR) \
sdc