From 155189bcfa95266320418b38992e46ea0d5140f0 Mon Sep 17 00:00:00 2001 From: paltherr Date: Tue, 2 Sep 2003 15:43:27 +0000 Subject: - Added PROJECT_VERSION --- Makefile | 2 +- Makefile.config | 1 + Makefile.distrib | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3