fix perl test, fix nroff test, fix Makefile to build outside source tree

diff --git a/ChangeLog b/ChangeLog
index 28c4bc769b3f96632575dae262253e5d14a08371..442a1ff1548d5e278f69e72506c84467d3ca8389 100644 (file)
--- 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                         

diff --git a/Makefile.in b/Makefile.in
index becf5f00acabc87d13972c54f1409d7bee93a736..44567cdabbbe45fefdd1b01374289cd2fe63ad3e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 85a32f549310c8ff146cc37d2e86c6c2fd4956a5..8cf096b82b0e88eafdb8a130d6b4e75414ff26da 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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