Makedist makes semver versions

diff --git a/makedist.sh b/makedist.sh
index 10883cdfa847a9d20de7a42ff6df8184f552c410..f958c626b27cbc1be56584da5edfbdfaf5801a2d 100755 (executable)
--- 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"