diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 19 |
2 files changed, 15 insertions, 8 deletions
@@ -4,6 +4,8 @@ | |||
4 | PAM kbdint code. Based on fix from Matthew Melvin | 4 | PAM kbdint code. Based on fix from Matthew Melvin |
5 | <matthewm@webcentral.com.au> | 5 | <matthewm@webcentral.com.au> |
6 | - (djm) Rename sysconfdir/primes => sysconfdir/moduli | 6 | - (djm) Rename sysconfdir/primes => sysconfdir/moduli |
7 | - (djm) Oops, forgot make logic for primes=>moduli. Also try to rename | ||
8 | existing primes->moduli if it exists. | ||
7 | 9 | ||
8 | 20010625 | 10 | 20010625 |
9 | - OpenBSD CVS Sync | 11 | - OpenBSD CVS Sync |
@@ -5798,4 +5800,4 @@ | |||
5798 | - Wrote replacements for strlcpy and mkdtemp | 5800 | - Wrote replacements for strlcpy and mkdtemp |
5799 | - Released 1.0pre1 | 5801 | - Released 1.0pre1 |
5800 | 5802 | ||
5801 | $Id: ChangeLog,v 1.1328 2001/06/27 07:07:16 djm Exp $ | 5803 | $Id: ChangeLog,v 1.1329 2001/06/27 11:52:32 djm Exp $ |
diff --git a/Makefile.in b/Makefile.in index 4133ed7ac..0458b3059 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.177 2001/06/10 17:43:36 mouring Exp $ | 1 | # $Id: Makefile.in,v 1.178 2001/06/27 11:52:33 djm Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -55,8 +55,8 @@ MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan. | |||
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 | 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 |
56 | MANTYPE = @MANTYPE@ | 56 | MANTYPE = @MANTYPE@ |
57 | 57 | ||
58 | CONFIGFILES=sshd_config.out ssh_config.out primes.out | 58 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out |
59 | CONFIGFILES_IN=sshd_config ssh_config primes | 59 | CONFIGFILES_IN=sshd_config ssh_config moduli |
60 | 60 | ||
61 | PATHSUBS = \ | 61 | PATHSUBS = \ |
62 | -D/etc/ssh_config=$(sysconfdir)/ssh_config \ | 62 | -D/etc/ssh_config=$(sysconfdir)/ssh_config \ |
@@ -68,7 +68,7 @@ PATHSUBS = \ | |||
68 | -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \ | 68 | -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \ |
69 | -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \ | 69 | -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \ |
70 | -D/var/run/sshd.pid=$(piddir)/sshd.pid \ | 70 | -D/var/run/sshd.pid=$(piddir)/sshd.pid \ |
71 | -D/etc/primes=$(sysconfdir)/primes \ | 71 | -D/etc/moduli=$(sysconfdir)/moduli \ |
72 | -D/etc/sshrc=$(sysconfdir)/sshrc \ | 72 | -D/etc/sshrc=$(sysconfdir)/sshrc \ |
73 | -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \ | 73 | -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \ |
74 | -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@ | 74 | -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@ |
@@ -217,10 +217,15 @@ install-files: | |||
217 | echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ | 217 | echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ |
218 | fi ; \ | 218 | fi ; \ |
219 | fi | 219 | fi |
220 | if [ ! -f $(DESTDIR)$(sysconfdir)/primes ]; then \ | 220 | if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ |
221 | $(INSTALL) -m 644 primes.out $(DESTDIR)$(sysconfdir)/primes; \ | 221 | if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ |
222 | echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ | ||
223 | mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ | ||
224 | else ; \ | ||
225 | $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ | ||
226 | fi ; \ | ||
222 | else \ | 227 | else \ |
223 | echo "$(DESTDIR)$(sysconfdir)/primes already exists, install will not overwrite"; \ | 228 | echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ |
224 | fi | 229 | fi |
225 | 230 | ||
226 | host-key: ssh-keygen$(EXEEXT) | 231 | host-key: ssh-keygen$(EXEEXT) |