- Patch from Stuart Henderson to build unbound-host man from .1.in.

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

diff --git a/Makefile.in b/Makefile.in
index 3775d73775737255454c65eb7473287d1210ebdd..bbe2f3933d4ffae5e0026ba3b9b87c6ac37195a2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -495,7 +495,7 @@ install-all:        all $(PYTHONMOD_INSTALL) $(PYUNBOUND_INSTALL) $(UNBOUND_EVENT_INSTA
        $(INSTALL) -c -m 644 doc/unbound-control.8 $(DESTDIR)$(mandir)/man8/unbound-control-setup.8
        $(INSTALL) -c -m 644 doc/unbound-anchor.8 $(DESTDIR)$(mandir)/man8
        $(INSTALL) -c -m 644 doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5
-       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -c -m 644 doc/unbound-host.1 $(DESTDIR)$(mandir)/man1
        $(INSTALL) -c -m 755 unbound-control-setup $(DESTDIR)$(sbindir)/unbound-control-setup
        if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi
 

diff --git a/configure b/configure
index 2b335024d678ebbe845319575bc644857f3d3f53..213fa3b036e6c6aebfdb2208005f7dabf242b521 100755 (executable)
--- a/configure
+++ b/configure
@@ -18368,7 +18368,7 @@ _ACEOF
 
 
 
-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"
+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"
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -19357,6 +19357,7 @@ do
     "doc/unbound-checkconf.8") CONFIG_FILES="$CONFIG_FILES doc/unbound-checkconf.8" ;;
     "doc/unbound.conf.5") CONFIG_FILES="$CONFIG_FILES doc/unbound.conf.5" ;;
     "doc/unbound-control.8") CONFIG_FILES="$CONFIG_FILES doc/unbound-control.8" ;;
+    "doc/unbound-host.1") CONFIG_FILES="$CONFIG_FILES doc/unbound-host.1" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

diff --git a/configure.ac b/configure.ac
index ff0f2443341b252bad754c81a74eeee8da9d6912..28ff07748155ecec19ae815f3b978caa5d68a99f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1224,6 +1224,6 @@ void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file,
 
 ])
 
-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])
+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])
 AC_CONFIG_HEADER([config.h])
 AC_OUTPUT

diff --git a/doc/Changelog b/doc/Changelog
index c1371ecfde5860c9d4317e2ed9270ec7d4d17931..4b3794df6875f0c1cd10c16330af1855907bd3dc 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+25 March 2014: Wouter
+       - Patch from Stuart Henderson to build unbound-host man from .1.in.
+
 24 March 2014: Wouter
        - Fix print filename of encompassing config file on read failure.
 

diff --git a/doc/unbound-host.1 b/doc/unbound-host.1.in
similarity index 100%
rename from doc/unbound-host.1
rename to doc/unbound-host.1.in

diff --git a/makedist.sh b/makedist.sh
index 7b78179797d68cd7a2827f9fa7f45e2619f97099..b378fae91b3aa2d4ad4c90243062f853ac5010da 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -389,7 +389,7 @@ replace_all doc/unbound.conf.5.in
 replace_all doc/unbound-checkconf.8.in
 replace_all doc/unbound-control.8.in
 replace_all doc/unbound-anchor.8.in
-replace_all doc/unbound-host.1
+replace_all doc/unbound-host.1.in
 replace_all doc/example.conf.in
 replace_all doc/libunbound.3.in