diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 626e79f65..2d47f637c 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -20,7 +20,7 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass | |||
20 | CC=@CC@ | 20 | CC=@CC@ |
21 | LD=@LD@ | 21 | LD=@LD@ |
22 | PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" | 22 | PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" |
23 | CFLAGS=@CFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@ | 23 | CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ |
24 | LIBS=@LIBS@ | 24 | LIBS=@LIBS@ |
25 | AR=@AR@ | 25 | AR=@AR@ |
26 | RANLIB=@RANLIB@ | 26 | RANLIB=@RANLIB@ |
@@ -29,6 +29,7 @@ PERL=@PERL@ | |||
29 | ENT=@ENT@ | 29 | ENT=@ENT@ |
30 | LDFLAGS=-L. @LDFLAGS@ | 30 | LDFLAGS=-L. @LDFLAGS@ |
31 | EXEEXT=@EXEEXT@ | 31 | EXEEXT=@EXEEXT@ |
32 | SSH_MODE= @SSHMODE@ | ||
32 | 33 | ||
33 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 34 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
34 | 35 | ||
@@ -121,13 +122,13 @@ distprep: catman-do | |||
121 | install: manpages $(TARGETS) install-files host-key | 122 | install: manpages $(TARGETS) install-files host-key |
122 | 123 | ||
123 | install-files: | 124 | install-files: |
124 | ./mkinstalldirs $(DESTDIR)$(bindir) | 125 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) |
125 | ./mkinstalldirs $(DESTDIR)$(sbindir) | 126 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) |
126 | ./mkinstalldirs $(DESTDIR)$(mandir) | 127 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) |
127 | ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 | 128 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 |
128 | ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 | 129 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 |
129 | ./mkinstalldirs $(DESTDIR)$(libexecdir) | 130 | $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) |
130 | $(INSTALL) -m 4755 -s ssh $(DESTDIR)$(bindir)/ssh | 131 | $(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh |
131 | $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp | 132 | $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp |
132 | $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add | 133 | $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add |
133 | $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent | 134 | $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent |
@@ -145,13 +146,14 @@ install-files: | |||
145 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 146 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
146 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 147 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
147 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 148 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
149 | @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin | ||
148 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ | 150 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ |
149 | ./mkinstalldirs $(DESTDIR)$(sysconfdir); \ | 151 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ |
150 | $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ | 152 | $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ |
151 | $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ | 153 | $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ |
152 | fi | 154 | fi |
153 | if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ | 155 | if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ |
154 | $(PERL) fixprogs ssh_prng_cmds $(ENT); \ | 156 | $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ |
155 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ | 157 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ |
156 | fi | 158 | fi |
157 | 159 | ||
@@ -160,18 +162,18 @@ host-key: ssh-keygen$(EXEEXT) | |||
160 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ | 162 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ |
161 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ | 163 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ |
162 | else \ | 164 | else \ |
163 | ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \ | 165 | $(srcdir)/ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \ |
164 | fi ; \ | 166 | fi ; \ |
165 | if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \ | 167 | if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \ |
166 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ | 168 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ |
167 | else \ | 169 | else \ |
168 | ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \ | 170 | $(srcdir)/ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \ |
169 | fi ; \ | 171 | fi ; \ |
170 | fi ; | 172 | fi ; |
171 | 173 | ||
172 | host-key-force: ssh-keygen$(EXEEXT) | 174 | host-key-force: ssh-keygen$(EXEEXT) |
173 | ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" | 175 | $(srcdir)/ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" |
174 | ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" | 176 | $(srcdir)/ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" |
175 | 177 | ||
176 | uninstallall: uninstall | 178 | uninstallall: uninstall |
177 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config | 179 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config |