From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 29 Nov 2016 13:44:29 +0000 (+0100)
Subject: Makedist makes semver versions
X-Git-Tag: release-1.7.0-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43fa3fca7d500bcdd23241441d5fd7ec8bec2b30;p=thirdparty%2Fldns.git

Makedist makes semver versions
---

diff --git a/makedist.sh b/makedist.sh
index 10883cdf..f958c626 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -76,7 +76,7 @@ replace_all () {
     replace_text "$1" "@date@" "`date +'%b %e, %Y'`"
 }
     
-CHECKOUT="master"
+CHECKOUT=""
 SNAPSHOT="no"
 RC="no"
 
@@ -104,6 +104,16 @@ while [ "$1" ]; do
     shift
 done
 
+if [ -z "$CHECKOUT" ]
+then
+	if [ "$RC" = "no" ]
+	then
+		CHECKOUT=master
+	else
+		CHECKOUT=develop
+	fi
+fi
+
 # Start the packaging process.
 info "SNAPSHOT is $SNAPSHOT"
 
@@ -156,7 +166,7 @@ RECONFIGURE="no"
 
 if [ "$RC" != "no" ]; then
     info "Building LDNS release candidate $RC."
-    version2="${version}rc$RC"
+    version2="${version}-rc$RC"
     info "Version number: $version2"
 
     replace_text "configure.ac" "AC_INIT(ldns, $version" "AC_INIT(ldns, $version2"