mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

This patch moves the overall version definition of the software out of

Browse source 
the common/Make.rules file into common/Version so that libapparmor's
configure.in can make use of it, meaning there's one less thing to
adjust when updating the version. It also bumps the trunk version
from 2.5 to 2.5.90 in (perhaps excessively long) preparation for the
2.6.0 release, and to indicate that it's newer than the 2.5.x branch.
This commit is contained in:
Steve Beattie 2010-10-07 15:37:30 -07:00
parent 0e1158c71d
commit c90b199488
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/Make.rules
View file

@ -25,7 +25,7 @@
# directories
DISTRIBUTION=AppArmor
VERSION=2.5
VERSION=$(shell cat common/Version)
# OVERRIDABLE variables
# Set these variables before including Make.rules to change its behavior

1
common/Version Normal file
View file

@ -0,0 +1 @@
2.5.90

7
libraries/libapparmor/configure.in
View file

@ -1,6 +1,11 @@
m4_define([__apparmor_version], m4_sinclude(common/Version))
m4_ifdef(__apparmor_version, , m4_define([__apparmor_version], m4_sinclude(../../common/Version)))
m4_define([__aalen], decr(len(__apparmor_version)))
m4_define([apparmor_version], m4_substr(__apparmor_version, 0, __aalen))
AC_INIT(configure.in)
AM_INIT_AUTOMAKE(libapparmor1, 2.5)
AM_INIT_AUTOMAKE(libapparmor1, apparmor_version)
AM_PROG_LEX
AC_PROG_YACC