summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2001-04-21 14:31:52 -0700
committerTim Rice <tim@multitalents.net>2001-04-21 14:31:52 -0700
commitb8fbb8eca0ae7ce621a40ee95cdb3f139398e0c9 (patch)
treeefca281b947153dc0d5491b1f823ea53f83474be
parent32c97c3712c71e00b11dd5ba87962c146606b3ba (diff)
fix perl test, fix nroff test, fix Makefile to build outside source tree
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in6
-rw-r--r--configure.in6
3 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b24b662..6d2d8855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
- (stevesk) set the default PAM service name to __progname instead
of the hard-coded value "sshd"; from Mark D. Roth <roth@feep.net>
- (stevesk) document PAM service name change in INSTALL
+ - tim@mindrot.org 2001/04/21 14:25:57 [Makefile.in configure.in]
+ fix perl test, fix nroff test, fix Makefile to build outside source tree
20010420
- OpenBSD CVS Sync
@@ -5198,4 +5200,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1151 2001/04/20 20:56:21 stevesk Exp $
+$Id: ChangeLog,v 1.1152 2001/04/21 21:31:52 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index b43c55e3..51adfacf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.172 2001/04/18 18:04:22 mouring Exp $
+# $Id: Makefile.in,v 1.173 2001/04/21 21:31:53 tim Exp $
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -123,9 +123,9 @@ logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o
$(MANPAGES)::
if test "$(MANTYPE)" = "cat"; then \
- manpage=`echo $@ | sed 's/\.[1-9]$$/\.0/'`; \
+ manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]$$/\.0/'`; \
else \
- manpage=$@; \
+ manpage=$(srcdir)/$@; \
fi; \
if test "$(MANTYPE)" = "man"; then \
$(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \
diff --git a/configure.in b/configure.in
index 1c1ed3f6..fe6e5593 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.278 2001/04/18 18:04:23 mouring Exp $
+# $Id: configure.in,v 1.279 2001/04/21 21:31:53 tim Exp $
AC_INIT(ssh.c)
@@ -12,7 +12,7 @@ AC_PROG_CPP
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(PERL, perl5 perl)
+AC_PATH_PROGS(PERL, perl5 perl)
AC_SUBST(PERL)
AC_PATH_PROG(ENT, ent)
AC_SUBST(ENT)
@@ -1412,7 +1412,7 @@ AC_ARG_WITH(catman,
]
)
if test -z "$MANTYPE"; then
- AC_PATH_PROGS(NROFF, nroff awf, /bin/false, /usr/bin)
+ AC_PATH_PROGS(NROFF, nroff awf, /bin/false)
if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
MANTYPE=doc
elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then