diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 6 | ||||
-rw-r--r-- | configure.in | 6 |
3 files changed, 9 insertions, 7 deletions
@@ -8,6 +8,8 @@ | |||
8 | - (stevesk) set the default PAM service name to __progname instead | 8 | - (stevesk) set the default PAM service name to __progname instead |
9 | of the hard-coded value "sshd"; from Mark D. Roth <roth@feep.net> | 9 | of the hard-coded value "sshd"; from Mark D. Roth <roth@feep.net> |
10 | - (stevesk) document PAM service name change in INSTALL | 10 | - (stevesk) document PAM service name change in INSTALL |
11 | - tim@mindrot.org 2001/04/21 14:25:57 [Makefile.in configure.in] | ||
12 | fix perl test, fix nroff test, fix Makefile to build outside source tree | ||
11 | 13 | ||
12 | 20010420 | 14 | 20010420 |
13 | - OpenBSD CVS Sync | 15 | - OpenBSD CVS Sync |
@@ -5198,4 +5200,4 @@ | |||
5198 | - Wrote replacements for strlcpy and mkdtemp | 5200 | - Wrote replacements for strlcpy and mkdtemp |
5199 | - Released 1.0pre1 | 5201 | - Released 1.0pre1 |
5200 | 5202 | ||
5201 | $Id: ChangeLog,v 1.1151 2001/04/20 20:56:21 stevesk Exp $ | 5203 | $Id: ChangeLog,v 1.1152 2001/04/21 21:31:52 tim Exp $ |
diff --git a/Makefile.in b/Makefile.in index b43c55e37..51adfacf9 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.172 2001/04/18 18:04:22 mouring Exp $ | 1 | # $Id: Makefile.in,v 1.173 2001/04/21 21:31:53 tim Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -123,9 +123,9 @@ logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o | |||
123 | 123 | ||
124 | $(MANPAGES):: | 124 | $(MANPAGES):: |
125 | if test "$(MANTYPE)" = "cat"; then \ | 125 | if test "$(MANTYPE)" = "cat"; then \ |
126 | manpage=`echo $@ | sed 's/\.[1-9]$$/\.0/'`; \ | 126 | manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]$$/\.0/'`; \ |
127 | else \ | 127 | else \ |
128 | manpage=$@; \ | 128 | manpage=$(srcdir)/$@; \ |
129 | fi; \ | 129 | fi; \ |
130 | if test "$(MANTYPE)" = "man"; then \ | 130 | if test "$(MANTYPE)" = "man"; then \ |
131 | $(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \ | 131 | $(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \ |
diff --git a/configure.in b/configure.in index 1c1ed3f6b..fe6e55933 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.278 2001/04/18 18:04:23 mouring Exp $ | 1 | # $Id: configure.in,v 1.279 2001/04/21 21:31:53 tim Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -12,7 +12,7 @@ AC_PROG_CPP | |||
12 | AC_PROG_RANLIB | 12 | AC_PROG_RANLIB |
13 | AC_PROG_INSTALL | 13 | AC_PROG_INSTALL |
14 | AC_PATH_PROG(AR, ar) | 14 | AC_PATH_PROG(AR, ar) |
15 | AC_PATH_PROG(PERL, perl5 perl) | 15 | AC_PATH_PROGS(PERL, perl5 perl) |
16 | AC_SUBST(PERL) | 16 | AC_SUBST(PERL) |
17 | AC_PATH_PROG(ENT, ent) | 17 | AC_PATH_PROG(ENT, ent) |
18 | AC_SUBST(ENT) | 18 | AC_SUBST(ENT) |
@@ -1412,7 +1412,7 @@ AC_ARG_WITH(catman, | |||
1412 | ] | 1412 | ] |
1413 | ) | 1413 | ) |
1414 | if test -z "$MANTYPE"; then | 1414 | if test -z "$MANTYPE"; then |
1415 | AC_PATH_PROGS(NROFF, nroff awf, /bin/false, /usr/bin) | 1415 | AC_PATH_PROGS(NROFF, nroff awf, /bin/false) |
1416 | if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then | 1416 | if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then |
1417 | MANTYPE=doc | 1417 | MANTYPE=doc |
1418 | elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then | 1418 | elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then |