try to base release versioning on PDNS_TAG even harder

diff --git a/build-scripts/make-jenkins-version b/build-scripts/make-jenkins-version
index f632bd1060e85489f2a71608d91866fc488e7428..a2ab0ffa7f6ca07cb9dfd4a36fdd0c3c3ba8ca4b 100755 (executable)
--- a/build-scripts/make-jenkins-version
+++ b/build-scripts/make-jenkins-version
@@ -27,9 +27,15 @@ then
        rpm_version=0.0.${rpm_dbg}
 elif [[ $GIT_BRANCH = rel/* ]] || [ $PDNS_TAG != HEAD ]
 then
-       # on release branch
-       product_version=${GIT_BRANCH#rel/}
-       product=${product_version%-*} # ex: "rec" or "auth"
+       # on release branch or doing a release
+       if [[ $PDNS_TAG = $BUILDING_PRODUCT-* ]]
+       then
+               product_version=${PDNS_TAG}
+               product=$BUILDING_PRODUCT
+       else
+               product_version=${GIT_BRANCH#rel/}
+               product=${product_version%-*} # ex: "rec" or "auth"
+       fi
        version=${product_version#*-} # ex: "3.5.1"
        if [ "$product" = "$BUILDING_PRODUCT" ]
        then