From: hanwen <hanwen>
Date: Mon, 15 Sep 2003 20:03:59 +0000 (+0000)
Subject: (MY_PATCH_LEVEL): readd VERSION; version number is now
X-Git-Tag: release/2.1.3~163
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=21b90d9aa1060cdfc0f53d510ff098d467119dd9;p=lilypond.git

(MY_PATCH_LEVEL): readd VERSION; version number is now
exported through config.make.
---

diff --git a/ChangeLog b/ChangeLog
index d33c37e997..0e7df8b634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* VERSION (MY_PATCH_LEVEL): readd VERSION; version number is now
+	exported through config.make.
+
 	* input/regression/clef-oct.ly: new file.
 
 	* scm/clef.scm (make-clef-set): use regexps, support arbitrary
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5612bade0e..128e1c4d62 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,7 +20,7 @@ SCRIPTS = configure aclocal.m4 autogen.sh
 README_FILES =  ChangeLog  COPYING DEDICATION ROADMAP THANKS
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) lilypond.vim vimrc  $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh
+EXTRA_DIST_FILES = $(wildcard *.el) VERSION lilypond.vim vimrc  $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -109,13 +109,6 @@ web-clean:
 
 default: $(config_h) builddir-setup $(outdir)/VERSION
 
-
-$(outdir)/VERSION: $(config_make)
-	echo 'MAJOR_VERSION=$(MAJOR_VERSION)' > $@
-	echo 'MINOR_VERSION=$(MINOR_VERSION)' >> $@
-	echo 'PATCH_LEVEL=$(PATCH_LEVEL)' >> $@
-	echo 'MY_PATCH_LEVEL=$(MY_PATCH_LEVEL)' >> $@
-
 builddir-setup: $(builddir)/share/lilypond-force
 
 PO_FILES = $(wildcard $(srcdir)/po/*.po)
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..8456a7dd97
--- /dev/null
+++ b/VERSION
@@ -0,0 +1,5 @@
+MAJOR_VERSION=1
+MINOR_VERSION=9
+PATCH_LEVEL=6
+MY_PATCH_LEVEL=
+
diff --git a/configure.in b/configure.in
index c5a5720bde..4a48fb099b 100644
--- a/configure.in
+++ b/configure.in
@@ -11,12 +11,8 @@ AC_CONFIG_AUX_DIR([stepmake/bin])
 # AC_CONFIG_AUX_DIR(bin)
 
 
-export PACKAGE_NAME=LilyPond
-export MAJOR_VERSION=1
-export MINOR_VERSION=9
-export PATCH_LEVEL=5
-export MY_PATCH_LEVEL=
 
+. VERSION 
 
 STEPMAKE_INIT
 
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 806a125b2a..1dc6601d61 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -152,7 +152,7 @@ check: local-check
 local-check:
 
 # ugh.  ugh ugh ugh
-$(config_make): $(topdir)/configure
+$(config_make): $(topdir)/configure $(topdir)/VERSION
 	@echo "************************************************************"
 	@echo "configure changed! You should probably reconfigure manually."
 	@echo "************************************************************"