- Fix #614: man page variable substitution bug.

git-svn-id: file:///svn/unbound/trunk@3234 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 40829514c6ec731ff7ac54f882ce5ae2e66158d5..d2f12c7aa7a81799e5cbc64bb5393814d16294e6 100755 (executable)
--- a/configure
+++ b/configure
@@ -632,6 +632,8 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+date
+version
 INSTALLTARGET
 ALLTARGET
 SOURCEFILE
@@ -20150,6 +20152,11 @@ _ACEOF
 
 
 
+version=1.4.23
+
+date=`date +'%b %e, %Y'`
+
+
 ac_config_files="$ac_config_files Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 doc/unbound-host.1 smallapp/unbound-control-setup.sh dnstap/dnstap_config.h"
 
 ac_config_headers="$ac_config_headers config.h"

diff --git a/configure.ac b/configure.ac
index a22ddc90cb06083426398c8d3efbcabba84d213e..7741a9998c5555297b27d07d544b7e8d1b62d82f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1365,6 +1365,11 @@ void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file,
 
 ])
 
+dnl if we build from source tree, the man pages need @date@ and @version@
+dnl if this is a distro tarball, that was already done by makedist.sh
+AC_SUBST(version, [VERSION_MAJOR.VERSION_MINOR.VERSION_MICRO])
+AC_SUBST(date, [`date +'%b %e, %Y'`])
+
 AC_CONFIG_FILES([Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 doc/unbound-host.1 smallapp/unbound-control-setup.sh dnstap/dnstap_config.h])
 AC_CONFIG_HEADER([config.h])
 AC_OUTPUT

diff --git a/doc/Changelog b/doc/Changelog
index d2f2235301970663d0cff88d638489e465bf3e2a..622c8340bf2c51f24f41eb0b027ce35782677b94 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+6 October 2014: Wouter
+       - Fix #614: man page variable substitution bug.
+
 1 October 2014: Wouter
        - fix #613: Allow tab ws in var length last rdfs (in ldns str2wire).