diff options
| author | Damien Miller <djm@mindrot.org> | 2002-02-10 18:32:28 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-02-10 18:32:28 +1100 |
| commit | 05eda437a64020e8d8a824bb1ae102603f59efb9 (patch) | |
| tree | 3a8a625d639922657232c8bbf772554842c1d97d /Makefile.in | |
| parent | 486065084237f5f8ea32d28832586c2dfa1d7307 (diff) | |
- (djm) OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2002/02/09 17:37:34
[pathnames.h session.c ssh.1 sshd.8 sshd_config ssh-keyscan.1]
move ssh config files to /etc/ssh
- (djm) Adjust portable Makefile.in tnd ssh-rand-helper.c o match
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 73538eac6..54bb6955a 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $Id: Makefile.in,v 1.194 2002/01/23 23:26:44 stevesk Exp $ | 1 | # $Id: Makefile.in,v 1.195 2002/02/10 07:32:29 djm Exp $ |
| 2 | 2 | ||
| 3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
| 4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
| @@ -19,7 +19,7 @@ SSH_PROGRAM=@bindir@/ssh | |||
| 19 | ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass | 19 | ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass |
| 20 | SFTP_SERVER=$(libexecdir)/sftp-server | 20 | SFTP_SERVER=$(libexecdir)/sftp-server |
| 21 | 21 | ||
| 22 | PATHS= -DETCDIR=\"$(sysconfdir)\" \ | 22 | PATHS= -DSSHDIR=\"$(sysconfdir)\" \ |
| 23 | -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ | 23 | -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ |
| 24 | -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ | 24 | -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ |
| 25 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ | 25 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ |
| @@ -62,17 +62,17 @@ CONFIGFILES=sshd_config.out ssh_config.out moduli.out | |||
| 62 | CONFIGFILES_IN=sshd_config ssh_config moduli | 62 | CONFIGFILES_IN=sshd_config ssh_config moduli |
| 63 | 63 | ||
| 64 | PATHSUBS = \ | 64 | PATHSUBS = \ |
| 65 | -D/etc/ssh_config=$(sysconfdir)/ssh_config \ | 65 | -D/etc/ssh/ssh_config=$(sysconfdir)/ssh_config \ |
| 66 | -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \ | 66 | -D/etc/ssh/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \ |
| 67 | -D/etc/sshd_config=$(sysconfdir)/sshd_config \ | 67 | -D/etc/ssh/sshd_config=$(sysconfdir)/sshd_config \ |
| 68 | -D/usr/libexec=$(libexecdir) \ | 68 | -D/usr/libexec=$(libexecdir) \ |
| 69 | -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv \ | 69 | -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv \ |
| 70 | -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key \ | 70 | -D/etc/ssh/ssh_host_key=$(sysconfdir)/ssh_host_key \ |
| 71 | -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \ | 71 | -D/etc/ssh/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \ |
| 72 | -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \ | 72 | -D/etc/ssh/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \ |
| 73 | -D/var/run/sshd.pid=$(piddir)/sshd.pid \ | 73 | -D/var/run/sshd.pid=$(piddir)/sshd.pid \ |
| 74 | -D/etc/moduli=$(sysconfdir)/moduli \ | 74 | -D/etc/ssh/moduli=$(sysconfdir)/moduli \ |
| 75 | -D/etc/sshrc=$(sysconfdir)/sshrc \ | 75 | -D/etc/ssh/sshrc=$(sysconfdir)/sshrc \ |
| 76 | -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \ | 76 | -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \ |
| 77 | -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@ | 77 | -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@ |
| 78 | 78 | ||