summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2018-07-10 17:10:13 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2018-07-10 17:10:13 +0900
commit302d43a130e2364ea882474088a8b0a31bc325b9 (patch)
treeb70dd81f82c99a9ac8d3da05ed4f36b583bdec1b /autogen.sh
parent1ac63f630cbe1b558ebe20b746bbe4962117d36f (diff)
downloadlibgpg-error-302d43a130e2364ea882474088a8b0a31bc325b9.tar.gz
build: Remove version_parts in autogen.sh.
* autogen.rc (version_parts): Remove. * autogen.sh: Determine by $micro argument. -- It can be determined by the invocation of ./autogen.sh --find-version Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh24
1 files changed, 10 insertions, 14 deletions
diff --git a/autogen.sh b/autogen.sh
index 23d27f3..9b36158 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@
# configure it for the respective package. It is maintained as part of
# GnuPG and source copied by other packages.
#
-# Version: 2018-02-21
+# Version: 2018-07-10
configure_ac="configure.ac"
@@ -74,7 +74,6 @@ PRINT_HOST=no
PRINT_BUILD=no
tmp=$(dirname "$0")
tsdir=$(cd "${tmp}"; pwd)
-version_parts=3
if [ -n "${AUTOGEN_SH_SILENT}" ]; then
SILENT=" --silent"
@@ -239,18 +238,15 @@ if [ "$myhost" = "find-version" ]; then
exit 1
fi
- case "$version_parts" in
- 2)
- matchstr1="$package-$major.[0-9]*"
- matchstr2="$package-$major-base"
- vers="$major.$minor"
- ;;
- *)
- matchstr1="$package-$major.$minor.[0-9]*"
- matchstr2="$package-$major.$minor-base"
- vers="$major.$minor.$micro"
- ;;
- esac
+ if [ -z "$micro" ]; then
+ matchstr1="$package-$major.[0-9]*"
+ matchstr2="$package-$major-base"
+ vers="$major.$minor"
+ else
+ matchstr1="$package-$major.$minor.[0-9]*"
+ matchstr2="$package-$major.$minor-base"
+ vers="$major.$minor.$micro"
+ fi
beta=no
if [ -e .git ]; then