From 3d3b875a70d2afc2485359e9d6b13ce214c74b7e Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 16 Dec 2008 15:30:47 +0000 Subject: [PATCH] makedist prerelease feature. git-svn-id: file:///svn/unbound/trunk@1389 be551aaa-1e26-0410-a405-d3ace91eadb9 --- configure.ac | 2 +- doc/Changelog | 3 +++ makedist.sh | 12 +++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 71e72d664..759428330 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.56) -AC_INIT(unbound,1.1.2, unbound-bugs@nlnetlabs.nl, unbound) +AC_INIT(unbound, 1.1.2, unbound-bugs@nlnetlabs.nl, unbound) LIBUNBOUND_CURRENT=0 LIBUNBOUND_REVISION=17 diff --git a/doc/Changelog b/doc/Changelog index 9266a3be0..4464db137 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +16 December 2008: Wouter + - follow makedist improvements from ldns, for maintainers prereleases. + 11 December 2008: Wouter - better fix for bug #219: use LOG_NDELAY with openlog() call. Thanks to Tamas Tevesz. diff --git a/makedist.sh b/makedist.sh index d1392a55c..f2198d58e 100755 --- a/makedist.sh +++ b/makedist.sh @@ -171,7 +171,7 @@ svn export "$SVNROOT" unbound || error_cleanup "SVN command failed" cd unbound || error_cleanup "Unbound not exported correctly from SVN" info "Adding libtool utils (libtoolize)." -libtoolize -c || error_cleanup "libtoolize failed" +libtoolize -c --install || libtoolize -c || error_cleanup "Libtoolize failed." info "Building configure script (autoreconf)." autoreconf || error_cleanup "Autoconf failed." @@ -207,8 +207,14 @@ info "Unbound version: $version" if [ "$SNAPSHOT" = "yes" ]; then info "Building Unbound snapshot." - version="$version-`date +%Y%m%d`" - info "Snapshot version number: $version" + version2="$version-`date +%Y%m%d`" + info "Snapshot version number: $version2" + + replace_text "configure.ac" "AC_INIT(unbound, $version" "AC_INIT(unbound, $version2" + version="$version2" + + info "Rebuilding configure script (autoconf) snapshot." + autoreconf || error_cleanup "Autoconf failed." fi replace_all doc/README