(MY_PATCH_LEVEL): readd VERSION; version number is now

exported through config.make.

diff --git a/ChangeLog b/ChangeLog
index d33c37e997381104a8715a952e19f372816d3a45..0e7df8b6347ff530ffa61bf5c31a13d0aff39b46 100644 (file)
--- 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 5612bade0e3b601ef1a05c73b2cbe1d4e71771a4..128e1c4d62fa73eb797f208479b1785bc7c4d6c0 100644 (file)
--- 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 (file)
index 0000000..8456a7d
--- /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 c5a5720bdedfe862d51ebda0bde5135374a6322d..4a48fb099bf4ee4d163c5fd5a72e7f3f77546cd3 100644 (file)
--- 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 806a125b2a7e46b3bb4fa46bee8b151ef58d714b..1dc6601d6144f5f89838976bb3d7bc5c19fdfe1b 100644 (file)
--- 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 "************************************************************"