diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | Makefile.in | 5 | ||||
-rw-r--r-- | configure.ac | 20 |
3 files changed, 28 insertions, 5 deletions
@@ -1,4 +1,10 @@ | |||
1 | 20110102 | 1 | 20110104 |
2 | - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage | ||
3 | formatter if it is present, followed by nroff and groff respectively. | ||
4 | Fixes distprep target on OpenBSD (which has bumped groff/nroff to ports | ||
5 | in favour of mandoc). feedback and ok tim | ||
6 | |||
7 | 20110103 | ||
2 | - (djm) [Makefile.in] revert local hack I didn't intend to commit | 8 | - (djm) [Makefile.in] revert local hack I didn't intend to commit |
3 | 9 | ||
4 | 20110102 | 10 | 20110102 |
diff --git a/Makefile.in b/Makefile.in index b46a7b26f..be65be6b3 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.313 2011/01/03 03:48:16 djm Exp $ | 1 | # $Id: Makefile.in,v 1.314 2011/01/03 21:16:29 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -58,6 +58,7 @@ ENT=@ENT@ | |||
58 | XAUTH_PATH=@XAUTH_PATH@ | 58 | XAUTH_PATH=@XAUTH_PATH@ |
59 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | 59 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ |
60 | EXEEXT=@EXEEXT@ | 60 | EXEEXT=@EXEEXT@ |
61 | MANFMT=@MANFMT@ | ||
61 | 62 | ||
62 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 63 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
63 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | 64 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ |
@@ -230,7 +231,7 @@ catman-do: | |||
230 | @for f in $(MANPAGES_IN) ; do \ | 231 | @for f in $(MANPAGES_IN) ; do \ |
231 | base=`echo $$f | sed 's/\..*$$//'` ; \ | 232 | base=`echo $$f | sed 's/\..*$$//'` ; \ |
232 | echo "$$f -> $$base.0" ; \ | 233 | echo "$$f -> $$base.0" ; \ |
233 | nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ | 234 | $(MANFMT) $$f | cat -v | sed -e 's/.\^H//g' \ |
234 | >$$base.0 ; \ | 235 | >$$base.0 ; \ |
235 | done | 236 | done |
236 | 237 | ||
diff --git a/configure.ac b/configure.ac index ec562b1c2..0eeb4df78 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.460 2011/01/02 10:53:09 djm Exp $ | 1 | # $Id: configure.ac,v 1.461 2011/01/03 21:16:29 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.460 $) | 18 | AC_REVISION($Revision: 1.461 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -41,8 +41,24 @@ AC_PATH_PROG(TEST_MINUS_S_SH, bash) | |||
41 | AC_PATH_PROG(TEST_MINUS_S_SH, ksh) | 41 | AC_PATH_PROG(TEST_MINUS_S_SH, ksh) |
42 | AC_PATH_PROG(TEST_MINUS_S_SH, sh) | 42 | AC_PATH_PROG(TEST_MINUS_S_SH, sh) |
43 | AC_PATH_PROG(SH, sh) | 43 | AC_PATH_PROG(SH, sh) |
44 | AC_PATH_PROG(GROFF, groff) | ||
45 | AC_PATH_PROG(NROFF, nroff) | ||
46 | AC_PATH_PROG(MANDOC, mandoc) | ||
44 | AC_SUBST(TEST_SHELL,sh) | 47 | AC_SUBST(TEST_SHELL,sh) |
45 | 48 | ||
49 | dnl select manpage formatter | ||
50 | if test "x$MANDOC" != "x" ; then | ||
51 | MANFMT="$MANDOC" | ||
52 | elif test "x$NROFF" != "x" ; then | ||
53 | MANFMT="$NROFF -mandoc" | ||
54 | elif test "x$GROFF" != "x" ; then | ||
55 | MANFMT="$GROFF -mandoc -Tascii" | ||
56 | else | ||
57 | AC_MSG_WARN([no manpage formatted found]) | ||
58 | MANFMT="false" | ||
59 | fi | ||
60 | AC_SUBST(MANFMT) | ||
61 | |||
46 | dnl for buildpkg.sh | 62 | dnl for buildpkg.sh |
47 | AC_PATH_PROG(PATH_GROUPADD_PROG, groupadd, groupadd, | 63 | AC_PATH_PROG(PATH_GROUPADD_PROG, groupadd, groupadd, |
48 | [/usr/sbin${PATH_SEPARATOR}/etc]) | 64 | [/usr/sbin${PATH_SEPARATOR}/etc]) |