Commit d5cf4386 by Michel Normand Committed by Daniel Lezcano

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: 's avatarMichel Normand <normand@fr.ibm.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 5c8f9bd8
...@@ -62,14 +62,6 @@ if test "x$GCC" = "xyes"; then ...@@ -62,14 +62,6 @@ if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -Wall"
fi 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([ AC_CONFIG_FILES([
Makefile Makefile
lxc.pc lxc.pc
......
...@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<refentrytitle>lxc</refentrytitle> <refentrytitle>lxc</refentrytitle>
<manvolnum>7</manvolnum> <manvolnum>7</manvolnum>
<refmiscinfo> <refmiscinfo>
Version @LXC_MAJOR_VERSION@.@LXC_MINOR_VERSION@.@LXC_MICRO_VERSION@ Version @PACKAGE_VERSION@
</refmiscinfo> </refmiscinfo>
</refmeta> </refmeta>
......
...@@ -5,7 +5,7 @@ includedir=@INCLUDEDIR@ ...@@ -5,7 +5,7 @@ includedir=@INCLUDEDIR@
Name: lxc Name: lxc
Description: linux container tools Description: linux container tools
Version: @LXC_MAJOR_VERSION@.@LXC_MINOR_VERSION@.@LXC_MICRO_VERSION@ Version: @PACKAGE_VERSION@
URL: http://lxc.sourceforge.net URL: http://lxc.sourceforge.net
Libs: -L${libdir} -llxc -lutil Libs: -L${libdir} -llxc -lutil
Cflags: -I${includedir} Cflags: -I${includedir}
#!/bin/bash #!/bin/bash
echo "lxc version: @LXC_MAJOR_VERSION@.@LXC_MINOR_VERSION@.@LXC_MICRO_VERSION@" echo "lxc version: @PACKAGE_VERSION@"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment