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 @@ | |||
1 | 20010417 | ||
2 | - (bal) Add perl5 check for HP/UX, Removed GNUness from Makefile.in | ||
3 | and temporary commneted out catman-do: since it's broken. Patches | ||
4 | for the first two by Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> | ||
5 | |||
1 | 20010416 | 6 | 20010416 |
2 | - OpenBSD CVS Sync | 7 | - OpenBSD CVS Sync |
3 | - stevesk@cvs.openbsd.org 2001/04/15 01:35:22 | 8 | - stevesk@cvs.openbsd.org 2001/04/15 01:35:22 |
@@ -5122,4 +5127,4 @@ | |||
5122 | - Wrote replacements for strlcpy and mkdtemp | 5127 | - Wrote replacements for strlcpy and mkdtemp |
5123 | - Released 1.0pre1 | 5128 | - Released 1.0pre1 |
5124 | 5129 | ||
5125 | $Id: ChangeLog,v 1.1128 2001/04/16 08:37:05 djm Exp $ | 5130 | $Id: ChangeLog,v 1.1129 2001/04/17 17:57:09 mouring Exp $ |
diff --git a/Makefile.in b/Makefile.in index 4b545e4b1..507da8e92 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.169 2001/04/16 08:36:39 djm Exp $ | 1 | # $Id: Makefile.in,v 1.170 2001/04/17 17:57:11 mouring Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -49,7 +49,7 @@ SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clie | |||
49 | 49 | ||
50 | 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 | 50 | 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 |
51 | 51 | ||
52 | 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 | 52 | MANPAGES = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 |
53 | MANTYPE = @MANTYPE@ | 53 | MANTYPE = @MANTYPE@ |
54 | 54 | ||
55 | CONFIGFILES=sshd_config ssh_config primes | 55 | 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 | |||
119 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o | 119 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o |
120 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) | 120 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) |
121 | 121 | ||
122 | $(MANPAGES): %.out: % | 122 | $(MANPAGES):: |
123 | if test "$(MANTYPE)" = "cat"; then \ | 123 | if test "$(MANTYPE)" = "cat"; then \ |
124 | manpage=`echo $< | sed 's/\.[1-9]$$/\.0/'`; \ | 124 | manpage=`echo $@ | sed 's/\.[1-9]$$/\.0/'`; \ |
125 | else \ | 125 | else \ |
126 | manpage=$<; \ | 126 | manpage=$@; \ |
127 | fi; \ | 127 | fi; \ |
128 | if test "$(MANTYPE)" = "man"; then \ | 128 | if test "$(MANTYPE)" = "man"; then \ |
129 | $(FIXPATHSCMD) $(srcdir)/$${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@; \ | 129 | $(FIXPATHSCMD) $(srcdir)/$${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \ |
130 | else \ | 130 | else \ |
131 | $(FIXPATHSCMD) $(srcdir)/$${manpage} > $@; \ | 131 | $(FIXPATHSCMD) $(srcdir)/$${manpage} > $@.out; \ |
132 | fi | 132 | fi |
133 | 133 | ||
134 | $(CONFIGFILES):: | 134 | $(CONFIGFILES):: |
@@ -148,15 +148,15 @@ mrproper: distclean | |||
148 | veryclean: distclean | 148 | veryclean: distclean |
149 | rm -f configure config.h.in *.0 | 149 | rm -f configure config.h.in *.0 |
150 | 150 | ||
151 | catman-do: | 151 | #catman-do: |
152 | @for f in $(TROFFMAN) ; do \ | 152 | # @for f in $(TROFFMAN) ; do \ |
153 | base=`echo $$f | sed 's/\..*$$//'` ; \ | 153 | # base=`echo $$f | sed 's/\..*$$//'` ; \ |
154 | echo "$$f -> $$base.0" ; \ | 154 | # echo "$$f -> $$base.0" ; \ |
155 | nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ | 155 | # nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ |
156 | >$$base.0 ; \ | 156 | # >$$base.0 ; \ |
157 | done | 157 | # done |
158 | 158 | ||
159 | distprep: catman-do | 159 | distprep: #catman-do |
160 | autoreconf | 160 | autoreconf |
161 | 161 | ||
162 | install: $(TARGETS) install-files host-key | 162 | install: $(TARGETS) install-files host-key |
diff --git a/configure.in b/configure.in index 7b9fdbc1a..4850308f7 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.276 2001/04/16 00:41:46 djm Exp $ | 1 | # $Id: configure.in,v 1.277 2001/04/17 17:57:11 mouring 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, perl) | 15 | AC_PATH_PROG(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) |