diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/Makefile.in b/Makefile.in index e2f2d56b9..b43c55e37 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.171 2001/04/18 15:46:03 mouring Exp $ | 1 | # $Id: Makefile.in,v 1.172 2001/04/18 18:04:22 mouring Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -6,6 +6,7 @@ bindir=@bindir@ | |||
6 | sbindir=@sbindir@ | 6 | sbindir=@sbindir@ |
7 | libexecdir=@libexecdir@ | 7 | libexecdir=@libexecdir@ |
8 | mandir=@mandir@ | 8 | mandir=@mandir@ |
9 | mansubdir=@mansubdir@ | ||
9 | sysconfdir=@sysconfdir@ | 10 | sysconfdir=@sysconfdir@ |
10 | piddir=@piddir@ | 11 | piddir=@piddir@ |
11 | srcdir=@srcdir@ | 12 | srcdir=@srcdir@ |
@@ -20,7 +21,8 @@ SFTP_SERVER=$(libexecdir)/sftp-server | |||
20 | PATHS= -DETCDIR=\"$(sysconfdir)\" \ | 21 | PATHS= -DETCDIR=\"$(sysconfdir)\" \ |
21 | -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ | 22 | -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ |
22 | -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ | 23 | -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ |
23 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" | 24 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ |
25 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" | ||
24 | 26 | ||
25 | CC=@CC@ | 27 | CC=@CC@ |
26 | LD=@LD@ | 28 | LD=@LD@ |
@@ -126,9 +128,9 @@ $(MANPAGES):: | |||
126 | manpage=$@; \ | 128 | manpage=$@; \ |
127 | fi; \ | 129 | fi; \ |
128 | if test "$(MANTYPE)" = "man"; then \ | 130 | if test "$(MANTYPE)" = "man"; then \ |
129 | $(FIXPATHSCMD) $(srcdir)/$${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \ | 131 | $(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \ |
130 | else \ | 132 | else \ |
131 | $(FIXPATHSCMD) $(srcdir)/$${manpage} > $@.out; \ | 133 | $(FIXPATHSCMD) $${manpage} > $@.out; \ |
132 | fi | 134 | fi |
133 | 135 | ||
134 | $(CONFIGFILES):: | 136 | $(CONFIGFILES):: |
@@ -165,6 +167,8 @@ install-files: | |||
165 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) | 167 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) |
166 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) | 168 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) |
167 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) | 169 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) |
170 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 | ||
171 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 | ||
168 | $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) | 172 | $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) |
169 | $(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh | 173 | $(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh |
170 | $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp | 174 | $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp |
@@ -175,22 +179,15 @@ install-files: | |||
175 | $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd | 179 | $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd |
176 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp | 180 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp |
177 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER) | 181 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER) |
178 | if test "$(MANTYPE)" = "doc"; then \ | 182 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
179 | mansubdir="man"; \ | 183 | $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
180 | else \ | 184 | $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
181 | mansubdir="$(MANTYPE)"; \ | 185 | $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 |
182 | fi; \ | 186 | $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 |
183 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$${mansubdir}1; \ | 187 | $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 |
184 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$${mansubdir}8; \ | 188 | $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
185 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh.1; \ | 189 | @NO_SFTP@$(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 |
186 | $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/scp.1; \ | 190 | @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
187 | $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh-add.1; \ | ||
188 | $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh-agent.1; \ | ||
189 | $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh-keygen.1; \ | ||
190 | $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh-keyscan.1; \ | ||
191 | $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$${mansubdir}8/sshd.8; \ | ||
192 | @NO_SFTP@$(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/sftp.1; \ | ||
193 | @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$${mansubdir}8/sftp-server.8; | ||
194 | -rm -f $(DESTDIR)$(bindir)/slogin | 191 | -rm -f $(DESTDIR)$(bindir)/slogin |
195 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 192 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
196 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 193 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |