Commit 9b20010b authored by Klaus Aehlig's avatar Klaus Aehlig
Browse files

Provide the DIRVERSION as a constant



Depending on configure options, the version string used in the name
of the version specific directory differs. Provide this string also
as a constant, as it is needed for the upgrade procedure, in order to
be able to roll back.
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarJose Lopes <jabolopes@google.com>
parent 55f0626b
......@@ -1786,6 +1786,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | stamp-directories
-DVERSION_REVISION="$(VERSION_REVISION)" \
-DVERSION_SUFFIX="$(VERSION_SUFFIX)" \
-DVERSION_FULL="$(VERSION_FULL)" \
-DDIRVERSION="$(DIRVERSION)" \
-DLOCALSTATEDIR="$(localstatedir)" \
-DSYSCONFDIR="$(sysconfdir)" \
-DSSH_CONFIG_DIR="$(SSH_CONFIG_DIR)" \
......
......@@ -48,6 +48,8 @@ VERSION_MAJOR = _constants.VERSION_MAJOR
VERSION_MINOR = _constants.VERSION_MINOR
VERSION_REVISION = _constants.VERSION_REVISION
DIR_VERSION = _constants.DIR_VERSION
CONFIG_MAJOR = _constants.CONFIG_MAJOR
CONFIG_MINOR = _constants.CONFIG_MINOR
CONFIG_REVISION = _constants.CONFIG_REVISION
......
......@@ -46,6 +46,9 @@ versionSuffix = "VERSION_SUFFIX"
versionFull :: String
versionFull = "VERSION_FULL"
dirVersion :: String
dirVersion = "DIRVERSION"
localstatedir :: String
localstatedir = "LOCALSTATEDIR"
......
......@@ -131,6 +131,9 @@ versionMinor = AutoConf.versionMinor
versionRevision :: Int
versionRevision = AutoConf.versionRevision
dirVersion :: String
dirVersion = AutoConf.dirVersion
configMajor :: Int
configMajor = AutoConf.versionMajor
......
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