From d5cf438682963ac84c3617941032ba623d4ac9b2 Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Wed, 4 Nov 2009 15:14:30 +0100 Subject: [PATCH] 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 Signed-off-by: Daniel Lezcano --- configure.ac | 8 -------- doc/lxc.sgml.in | 2 +- lxc.pc.in | 2 +- src/lxc/lxc-version.in | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index e44d40a79..a9ca2118c 100644 --- 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 961a967fe..af2efab02 100644 --- 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 lxc 7 - Version @LXC_MAJOR_VERSION@.@LXC_MINOR_VERSION@.@LXC_MICRO_VERSION@ + Version @PACKAGE_VERSION@ diff --git a/lxc.pc.in b/lxc.pc.in index 188cbe543..cd513c015 100644 --- 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 dcc88b21b..1bd055a71 100644 --- 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@" -- 2.47.2