diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.in | 30 | ||||
-rw-r--r-- | configure.in | 4 |
3 files changed, 23 insertions, 18 deletions
@@ -1,3 +1,8 @@ +20010417 + - (bal) Add perl5 check for HP/UX, Removed GNUness from Makefile.in + and temporary commneted out catman-do: since it's broken. Patches + for the first two by Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> + 20010416 - OpenBSD CVS Sync - stevesk@cvs.openbsd.org 2001/04/15 01:35:22 @@ -5122,4 +5127,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1128 2001/04/16 08:37:05 djm Exp $ +$Id: ChangeLog,v 1.1129 2001/04/17 17:57:09 mouring Exp $ diff --git a/Makefile.in b/Makefile.in index 4b545e4b..507da8e9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.169 2001/04/16 08:36:39 djm Exp $ +# $Id: Makefile.in,v 1.170 2001/04/17 17:57:11 mouring Exp $ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -49,7 +49,7 @@ SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clie SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o -MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out +MANPAGES = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 MANTYPE = @MANTYPE@ CONFIGFILES=sshd_config ssh_config primes @@ -119,16 +119,16 @@ sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) -$(MANPAGES): %.out: % +$(MANPAGES):: if test "$(MANTYPE)" = "cat"; then \ - manpage=`echo $< | sed 's/\.[1-9]$$/\.0/'`; \ + manpage=`echo $@ | sed 's/\.[1-9]$$/\.0/'`; \ else \ - manpage=$<; \ + manpage=$@; \ fi; \ if test "$(MANTYPE)" = "man"; then \ - $(FIXPATHSCMD) $(srcdir)/$${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@; \ + $(FIXPATHSCMD) $(srcdir)/$${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \ else \ - $(FIXPATHSCMD) $(srcdir)/$${manpage} > $@; \ + $(FIXPATHSCMD) $(srcdir)/$${manpage} > $@.out; \ fi $(CONFIGFILES):: @@ -148,15 +148,15 @@ mrproper: distclean veryclean: distclean rm -f configure config.h.in *.0 -catman-do: - @for f in $(TROFFMAN) ; do \ - base=`echo $$f | sed 's/\..*$$//'` ; \ - echo "$$f -> $$base.0" ; \ - nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ - >$$base.0 ; \ - done +#catman-do: +# @for f in $(TROFFMAN) ; do \ +# base=`echo $$f | sed 's/\..*$$//'` ; \ +# echo "$$f -> $$base.0" ; \ +# nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ +# >$$base.0 ; \ +# done -distprep: catman-do +distprep: #catman-do autoreconf install: $(TARGETS) install-files host-key diff --git a/configure.in b/configure.in index 7b9fdbc1..4850308f 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.276 2001/04/16 00:41:46 djm Exp $ +# $Id: configure.in,v 1.277 2001/04/17 17:57:11 mouring 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, perl) +AC_PATH_PROG(PERL, perl5 perl) AC_SUBST(PERL) AC_PATH_PROG(ENT, ent) AC_SUBST(ENT) |