diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 25 |
2 files changed, 17 insertions, 12 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20010427 | 1 | 20010427 |
2 | - (bal) Fixed uidswap.c so it should work on non-posix complient systems. | 2 | - (bal) Fixed uidswap.c so it should work on non-posix complient systems. |
3 | patch based on 2.5.2 version by djm. | 3 | patch based on 2.5.2 version by djm. |
4 | - (bal) Build manpages and config files once unless changed. Patch by | ||
5 | Carson Gaspar <carson@taltos.org> | ||
4 | 6 | ||
5 | 20010425 | 7 | 20010425 |
6 | - OpenBSD CVS Sync | 8 | - OpenBSD CVS Sync |
@@ -5256,4 +5258,4 @@ | |||
5256 | - Wrote replacements for strlcpy and mkdtemp | 5258 | - Wrote replacements for strlcpy and mkdtemp |
5257 | - Released 1.0pre1 | 5259 | - Released 1.0pre1 |
5258 | 5260 | ||
5259 | $Id: ChangeLog,v 1.1172 2001/04/26 23:03:37 mouring Exp $ | 5261 | $Id: ChangeLog,v 1.1173 2001/04/27 00:31:07 mouring Exp $ |
diff --git a/Makefile.in b/Makefile.in index 51adfacf9..dda7b48fc 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.173 2001/04/21 21:31:53 tim Exp $ | 1 | # $Id: Makefile.in,v 1.174 2001/04/27 00:31:08 mouring Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -51,10 +51,12 @@ SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clie | |||
51 | 51 | ||
52 | 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 | 52 | 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 |
53 | 53 | ||
54 | MANPAGES = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 | 54 | 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 |
55 | MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 | ||
55 | MANTYPE = @MANTYPE@ | 56 | MANTYPE = @MANTYPE@ |
56 | 57 | ||
57 | CONFIGFILES=sshd_config ssh_config primes | 58 | CONFIGFILES=sshd_config.out ssh_config.out primes.out |
59 | CONFIGFILES_IN=sshd_config ssh_config primes | ||
58 | 60 | ||
59 | PATHSUBS = \ | 61 | PATHSUBS = \ |
60 | -D/etc/ssh_config=$(sysconfdir)/ssh_config \ | 62 | -D/etc/ssh_config=$(sysconfdir)/ssh_config \ |
@@ -121,20 +123,21 @@ sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common | |||
121 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o | 123 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o |
122 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) | 124 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) |
123 | 125 | ||
124 | $(MANPAGES):: | 126 | $(MANPAGES): $(MANPAGES_IN) |
125 | if test "$(MANTYPE)" = "cat"; then \ | 127 | if test "$(MANTYPE)" = "cat"; then \ |
126 | manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]$$/\.0/'`; \ | 128 | manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \ |
127 | else \ | 129 | else \ |
128 | manpage=$(srcdir)/$@; \ | 130 | manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ |
129 | fi; \ | 131 | fi; \ |
130 | if test "$(MANTYPE)" = "man"; then \ | 132 | if test "$(MANTYPE)" = "man"; then \ |
131 | $(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \ | 133 | $(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@; \ |
132 | else \ | 134 | else \ |
133 | $(FIXPATHSCMD) $${manpage} > $@.out; \ | 135 | $(FIXPATHSCMD) $${manpage} > $@; \ |
134 | fi | 136 | fi |
135 | 137 | ||
136 | $(CONFIGFILES):: | 138 | $(CONFIGFILES): $(CONFIGFILES_IN) |
137 | $(FIXPATHSCMD) $(srcdir)/$@ > $@.out | 139 | conffile=`echo $@ | sed 's/.out$$//'`; \ |
140 | $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@ | ||
138 | 141 | ||
139 | clean: | 142 | clean: |
140 | (cd openbsd-compat; $(MAKE) clean) | 143 | (cd openbsd-compat; $(MAKE) clean) |
@@ -151,7 +154,7 @@ veryclean: distclean | |||
151 | rm -f configure config.h.in *.0 | 154 | rm -f configure config.h.in *.0 |
152 | 155 | ||
153 | catman-do: | 156 | catman-do: |
154 | @for f in $(MANPAGES) ; do \ | 157 | @for f in $(MANPAGES_IN) ; do \ |
155 | base=`echo $$f | sed 's/\..*$$//'` ; \ | 158 | base=`echo $$f | sed 's/\..*$$//'` ; \ |
156 | echo "$$f -> $$base.0" ; \ | 159 | echo "$$f -> $$base.0" ; \ |
157 | nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ | 160 | nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ |