From: Willem Toorop Date: Wed, 24 Jul 2019 12:41:08 +0000 (-0400) Subject: Fixed makedist.sh for Dist::zilla X-Git-Tag: release-1.7.1~6^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F37%2Fhead;p=thirdparty%2Fldns.git Fixed makedist.sh for Dist::zilla --- diff --git a/makedist.sh b/makedist.sh index 04002626..557d57d2 100755 --- a/makedist.sh +++ b/makedist.sh @@ -156,9 +156,17 @@ rm makedist.sh || error_cleanup "Failed to remove makedist.sh." info "Determining LDNS version." version=$(./configure --version | head -1 | awk '{ print $3 }') || \ error_cleanup "Cannot determine version number." - +( cd contrib/DNS-LDNS; dzil build && mv -v DNS-LDNS-*.tar.gz .. ) +perl_tarball="$(cd contrib; echo DNS-LDNS-*.tar.gz)" +perl_version="${perl_tarball%.tar.gz}" +perl_version="${perl_version#DNS-LDNS-}" +( cd contrib && + rm -fr DNS-LDNS && + tar xzvf "$perl_tarball" && + mv "DNS-LDNS-$perl_version" DNS-LDNS && + rm -f "$perl_tarball" ) info "LDNS version: $version" -exit 0 +info "DNS-LDNS perl module version: $perl_version" RECONFIGURE="no"