From: Wouter Wijngaards Date: Tue, 25 Mar 2014 08:09:33 +0000 (+0000) Subject: - Patch from Stuart Henderson to build unbound-host man from .1.in. X-Git-Tag: release-1.5.0rc1~158 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fabf2a8ab3c83da1861e7439fbcf1d89b49fcce;p=thirdparty%2Funbound.git - 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 3775d7377..bbe2f3933 100644 --- 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 2b335024d..213fa3b03 100755 --- 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 ff0f24433..28ff07748 100644 --- 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 c1371ecfd..4b3794df6 100644 --- 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 7b7817979..b378fae91 100755 --- 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