From ebcf244e9f0816ba616544f2de2439418d3ec2f5 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 6 Oct 2014 07:42:42 +0000 Subject: [PATCH] - Fix #614: man page variable substitution bug. git-svn-id: file:///svn/unbound/trunk@3234 be551aaa-1e26-0410-a405-d3ace91eadb9 --- configure | 7 +++++++ configure.ac | 5 +++++ doc/Changelog | 3 +++ 3 files changed, 15 insertions(+) diff --git a/configure b/configure index 40829514c..d2f12c7aa 100755 --- 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 a22ddc90c..7741a9998 100644 --- 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 d2f223530..622c8340b 100644 --- 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). -- 2.47.2