diff options
| author |   sthen <sthen@openbsd.org> | 2014-03-26 21:35:28 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2014-03-26 21:35:28 +0000 |
| commit | aae5ff5aca6eb3785e5015fb49f60871472308c6 (patch) | |
| tree | 63b58347c55626b890f43e9844b77d3ba17482b8 | |
| parent | Print correct filename if config errors exist in an "include"d file. (diff) | |
| download | wireguard-openbsd-aae5ff5aca6eb3785e5015fb49f60871472308c6.tar.xz wireguard-openbsd-aae5ff5aca6eb3785e5015fb49f60871472308c6.zip | |
Handle unbound-host(1) the same way as other manpages and have configure
generate a copy in the build directory. Removes some complexity and fixes
a problem noticed by rpe@ when running 'make -f Makefile.bsd-wrapper clean'
in src dir without having an obj dir present. From upstream r3100.
| -rw-r--r-- | usr.sbin/unbound/Makefile.in | 2 | ||||
| -rw-r--r-- | usr.sbin/unbound/configure | 3 | ||||
| -rw-r--r-- | usr.sbin/unbound/configure.ac | 2 | ||||
| -rw-r--r-- | usr.sbin/unbound/doc/unbound-host.1.in (renamed from usr.sbin/unbound/doc/unbound-host.1) | 0 |
4 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/unbound/Makefile.in b/usr.sbin/unbound/Makefile.in index 0600d2a3d98..b6241f57f9e 100644 --- a/usr.sbin/unbound/Makefile.in +++ b/usr.sbin/unbound/Makefile.in @@ -498,7 +498,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/usr.sbin/unbound/configure b/usr.sbin/unbound/configure index 71de3cebc5d..e540ec017d2 100644 --- a/usr.sbin/unbound/configure +++ b/usr.sbin/unbound/configure @@ -18366,7 +18366,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" @@ -19355,6 +19355,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/usr.sbin/unbound/configure.ac b/usr.sbin/unbound/configure.ac index 94c587d7486..f829590de8e 100644 --- a/usr.sbin/unbound/configure.ac +++ b/usr.sbin/unbound/configure.ac @@ -1222,6 +1222,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/usr.sbin/unbound/doc/unbound-host.1 b/usr.sbin/unbound/doc/unbound-host.1.in index 1c8c42d587c..1c8c42d587c 100644 --- a/usr.sbin/unbound/doc/unbound-host.1 +++ b/usr.sbin/unbound/doc/unbound-host.1.in |