summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-09-30 11:48:20 +0200
committerPetr Viktorin <pviktori@redhat.com>2014-09-30 13:24:26 +0200
commit9ba33971fad5ec3b6fb5445669228b0ea9a89ec5 (patch)
tree67236a3f50ebbd4d11025061bbc50fb0750f003d /Makefile
parent00457a9c109c1df0788a979f07c7fb5c0cc3bc8b (diff)
downloadfreeipa-9ba33971fad5ec3b6fb5445669228b0ea9a89ec5.tar.gz
freeipa-9ba33971fad5ec3b6fb5445669228b0ea9a89ec5.tar.xz
freeipa-9ba33971fad5ec3b6fb5445669228b0ea9a89ec5.zip
VERSION,Makefile: Rename "pre" to "alpha"
Last time (2.1) we used "Preview/Testing" for the pre-beta release, but the Git tags were still named alpha_*. Use "alpha", remove "pre".
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3bdec716d..eca282a23 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ endif # in a git tree and git returned a version
endif # git
ifndef IPA_VERSION
-ifdef IPA_VERSION_PRE_RELEASE
-IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).pre$(IPA_VERSION_PRE_RELEASE)
+ifdef IPA_VERSION_ALPHA_RELEASE
+IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).alpha$(IPA_VERSION_ALPHA_RELEASE)
else
ifdef IPA_VERSION_BETA_RELEASE
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).beta$(IPA_VERSION_BETA_RELEASE)
@@ -35,7 +35,7 @@ else
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE)
endif # rc
endif # beta
-endif # pre
+endif # alpha
endif # ipa_version
IPA_VENDOR_VERSION=$(IPA_VERSION)$(IPA_VENDOR_VERSION_SUFFIX)