Make version number internally consistent.

diff --git a/VERSION b/VERSION
index bcee9b68a6f623da449112098f2cce771c65449c..33e4775eb7d77a8352b279a6d92403e8370e830c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.90.00 (2001-12-11)
+0.90.01-cvs (2001-12-12)

diff --git a/configure b/configure
index f56c7ded7ee33bd23bbb8882d1c8816681635297..b3c65f3928ed91d0cc1b90a82680548bedfc33f4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1952,6 +1952,13 @@ then
 fi
 echo "$ac_t""$interface" 1>&6
 
+if test "-f VERSION" ; then
+  DM_VERSION="\"`cat VERSION|sed -e \"s/[0-9.]*/\0-$interface/\"`\""
+else
+  DM_VERSION="Unknown version ($interface)"
+fi
+
+
 
 
 
@@ -2080,6 +2087,7 @@ include/Makefile                                                        \
 dmsetup/Makefile                                                       \
 lib/Makefile                                                           \
 kernel/Makefile                                                                \
+kernel/common/dm.c                                                     \
 " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -2128,6 +2136,7 @@ s%@interface@%$interface%g
 s%@kerneldir@%$kerneldir%g
 s%@kernelvsn@%$kernelvsn%g
 s%@tmpdir@%$tmpdir%g
+s%@DM_VERSION@%$DM_VERSION%g
 
 CEOF
 EOF
@@ -2176,6 +2185,7 @@ include/Makefile                                                        \
 dmsetup/Makefile                                                       \
 lib/Makefile                                                           \
 kernel/Makefile                                                                \
+kernel/common/dm.c                                                     \
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

diff --git a/configure.in b/configure.in
index f976e0e02f4b94f27f18204a9201638c51fa31a9..2db5b6ce0fae633b15fdb62f7b283ace7473fa46 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -138,6 +138,12 @@ then
 fi
 echo "$ac_t""$interface" 1>&6
 
+if test "-f VERSION" ; then
+  DM_VERSION="\"`cat VERSION|sed -e \"s/[[0-9.]]*/\0-$interface/\"`\""
+else
+  DM_VERSION="Unknown version ($interface)"
+fi
+
 AC_SUBST(JOBS)
 AC_SUBST(OWNER)
 AC_SUBST(GROUP)
@@ -146,6 +152,7 @@ AC_SUBST(interface)
 AC_SUBST(kerneldir)
 AC_SUBST(kernelvsn)
 AC_SUBST(tmpdir)
+AC_SUBST(DM_VERSION)
 dnl First and last lines should not contain files to generate in order to 
 dnl keep utility scripts running properly
 AC_OUTPUT(                                                             \
@@ -155,4 +162,5 @@ include/Makefile                                                        \
 dmsetup/Makefile                                                       \
 lib/Makefile                                                           \
 kernel/Makefile                                                                \
+kernel/common/dm.c                                                     \
 )

diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index e9bdc02bdfde3d020436b5c393c777a6abb15bdf..8489179bd2457fcff2a503f374380f5d9c71d86c 100644 (file)
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -120,7 +120,7 @@ install:
 clean:
 
 distclean:
-       $(RM) Makefile 
+       $(RM) Makefile common/dm.c
 
 .PHONY: install clean distclean all
 

diff --git a/kernel/common/dm.c b/kernel/common/dm.c.in
similarity index 98%
rename from kernel/common/dm.c
rename to kernel/common/dm.c.in
index b3dde8b61c622bfcbc04b5ba5afd5c45b82b0064..af2c1a66b3956c6b22ce0856b1148e67201e46c7 100644 (file)
--- a/kernel/common/dm.c
+++ b/kernel/common/dm.c.in
@@ -19,7 +19,9 @@
 #define DEVICE_NAME "device-mapper"
 
 static const char *_name = DEVICE_NAME;
-static int _version[3] = { 0, 1, 0 };
+static const char *_version = @DM_VERSION@;
+static const char *_email = "lvm-devel@lists.sistina.com";
+
 static int major = 0;
 
 struct io_hook {
@@ -87,8 +89,7 @@ static int __init dm_init(void)
 
        _dev_dir = devfs_mk_dir(0, DM_DIR, NULL);
 
-       printk(KERN_INFO "%s %d.%d.%d initialised\n", _name,
-              _version[0], _version[1], _version[2]);
+       printk(KERN_INFO "%s %s initialised, %s\n", _name, _version, _email);
        return 0;
 
       err_blkdev: