lxc: lxc version to reflect string in AC_INIT (V2)

I changed the code to have lxc version to reflect the
string set in AC_INIT of configure.ac
rather than to report only the 3 first digits

update: use PACKAGE_VERSION in place of VERSION

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/configure.ac b/configure.ac
index e44d40a7933fe0d7b46cce287fa899fe292226f4..a9ca2118c1f5c4f5f1ef0b211d191e99f3ddb7c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,14 +62,6 @@ if test "x$GCC" = "xyes"; then
   CFLAGS="$CFLAGS -Wall"
 fi
 
-LXC_MAJOR_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f1)
-LXC_MINOR_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f2)
-LXC_MICRO_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f3)
-
-AC_SUBST(LXC_MAJOR_VERSION)
-AC_SUBST(LXC_MINOR_VERSION)
-AC_SUBST(LXC_MICRO_VERSION)
-
 AC_CONFIG_FILES([
         Makefile
        lxc.pc

diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
index 961a967febdf144e41be68fc96f85a10fe2f13ab..af2efab02c530a38dcc75e5a05560628630bfd84 100644 (file)
--- a/doc/lxc.sgml.in
+++ b/doc/lxc.sgml.in
@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <refentrytitle>lxc</refentrytitle>
     <manvolnum>7</manvolnum>
     <refmiscinfo>
-      Version @LXC_MAJOR_VERSION@.@LXC_MINOR_VERSION@.@LXC_MICRO_VERSION@
+      Version @PACKAGE_VERSION@
     </refmiscinfo>
   </refmeta>
 

diff --git a/lxc.pc.in b/lxc.pc.in
index 188cbe5432022b4b4b01fcd2e8f014a167d605da..cd513c0156f1caaa3f2987cebd7e440c714007e0 100644 (file)
--- a/lxc.pc.in
+++ b/lxc.pc.in
@@ -5,7 +5,7 @@ includedir=@INCLUDEDIR@
 
 Name: lxc
 Description: linux container tools
-Version: @LXC_MAJOR_VERSION@.@LXC_MINOR_VERSION@.@LXC_MICRO_VERSION@
+Version: @PACKAGE_VERSION@
 URL: http://lxc.sourceforge.net
 Libs: -L${libdir} -llxc -lutil
 Cflags: -I${includedir}

diff --git a/src/lxc/lxc-version.in b/src/lxc/lxc-version.in
index dcc88b21b3cafda4937a92eba71cd1f408bd4561..1bd055a71eecaa55451dfc17e4d30bddf5fe0cf6 100644 (file)
--- a/src/lxc/lxc-version.in
+++ b/src/lxc/lxc-version.in
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-echo "lxc version: @LXC_MAJOR_VERSION@.@LXC_MINOR_VERSION@.@LXC_MICRO_VERSION@"
+echo "lxc version: @PACKAGE_VERSION@"