diff options
author | Damien Miller <djm@mindrot.org> | 2000-11-11 08:36:38 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-11-11 08:36:38 +1100 |
commit | 0986b55a601066b1dc896c4508a55e905ea8d0ea (patch) | |
tree | d26d7627bdf3d667bbe92772be8d70925770c763 /Makefile.in | |
parent | dcca981e88978f84e404ef718e0e997b518403f0 (diff) |
- (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and
packaging files
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index d0d8ba93..362fd708 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,9 +47,9 @@ TROFFMAN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8 sftp-server.8 CATMAN = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh.0 sshd.0 sftp-server.0 MANPAGES = @MANTYPE@ -CONFIGFILES=sshd_config ssh_config +CONFIGFILES=sshd_config ssh_config primes -PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts -D/etc/sshd_config=$(sysconfdir)/sshd_config -D/usr/libexec=$(libexecdir) -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key -D/var/run/sshd.pid=$(piddir)/sshd.pid +PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts -D/etc/sshd_config=$(sysconfdir)/sshd_config -D/usr/libexec=$(libexecdir) -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key -D/var/run/sshd.pid=$(piddir)/sshd.pid -D/etc/primes=$(sysconfdir)/primes FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS) @@ -147,17 +147,32 @@ install-files: -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ + if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ + fi + if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ + else \ + echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite" \ + fi + if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ + else \ + echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite" \ fi if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ + else \ + echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite" \ fi ; \ fi + if [ ! -f $(DESTDIR)$(sysconfdir)/primes ]; then \ + $(INSTALL) -m 644 primes $(DESTDIR)$(sysconfdir)/primes; \ + else \ + echo "$(DESTDIR)$(sysconfdir)/primes already exists, install will not overwrite" \ + fi host-key: ssh-keygen$(EXEEXT) if [ -z "$(DESTDIR)" ] ; then \ |