diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index e7faa1591..89d02c959 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.217 2002/06/25 23:45:42 tim Exp $ | 1 | # $Id: Makefile.in,v 1.222 2002/07/14 17:02:21 tim Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -129,7 +129,7 @@ ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o | |||
129 | $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 129 | $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
130 | 130 | ||
131 | ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o | 131 | ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o |
132 | $(LD) -o $@ ssh-keysign.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 132 | $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
133 | 133 | ||
134 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o | 134 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o |
135 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) | 135 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |
@@ -198,12 +198,11 @@ distprep: catman-do | |||
198 | $(AUTORECONF) | 198 | $(AUTORECONF) |
199 | (cd scard && $(MAKE) -f Makefile.in distprep) | 199 | (cd scard && $(MAKE) -f Makefile.in distprep) |
200 | 200 | ||
201 | install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-user | 201 | install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config |
202 | install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files | 202 | install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files |
203 | 203 | ||
204 | check-user: | 204 | check-config: |
205 | id $(SSH_PRIVSEP_USER) || \ | 205 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config |
206 | echo "WARNING: Privilege separation user \"$(SSH_PRIVSEP_USER)\" does not exist" | ||
207 | 206 | ||
208 | scard-install: | 207 | scard-install: |
209 | (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install) | 208 | (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install) |
@@ -217,8 +216,7 @@ install-files: scard-install | |||
217 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 | 216 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 |
218 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 | 217 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 |
219 | $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) | 218 | $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) |
220 | $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH) | 219 | (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)) |
221 | chmod 0700 $(DESTDIR)$(PRIVSEP_PATH) | ||
222 | $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh | 220 | $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh |
223 | $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp | 221 | $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp |
224 | $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add | 222 | $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add |
@@ -248,23 +246,23 @@ install-files: scard-install | |||
248 | @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 246 | @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
249 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 247 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
250 | -rm -f $(DESTDIR)$(bindir)/slogin | 248 | -rm -f $(DESTDIR)$(bindir)/slogin |
251 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 249 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
252 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 250 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
253 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 251 | ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
254 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | 252 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ |
255 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ | 253 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ |
256 | fi | 254 | fi |
257 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ | 255 | @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ |
258 | $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ | 256 | $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ |
259 | else \ | 257 | else \ |
260 | echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ | 258 | echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ |
261 | fi | 259 | fi |
262 | if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ | 260 | @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ |
263 | $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ | 261 | $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ |
264 | else \ | 262 | else \ |
265 | echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ | 263 | echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ |
266 | fi | 264 | fi |
267 | if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ | 265 | @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ |
268 | $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ | 266 | $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ |
269 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ | 267 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ |
270 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ | 268 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ |
@@ -272,7 +270,7 @@ install-files: scard-install | |||
272 | echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ | 270 | echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ |
273 | fi ; \ | 271 | fi ; \ |
274 | fi | 272 | fi |
275 | if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ | 273 | @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ |
276 | if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ | 274 | if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ |
277 | echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ | 275 | echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ |
278 | mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ | 276 | mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ |
@@ -284,7 +282,7 @@ install-files: scard-install | |||
284 | fi | 282 | fi |
285 | 283 | ||
286 | host-key: ssh-keygen$(EXEEXT) | 284 | host-key: ssh-keygen$(EXEEXT) |
287 | if [ -z "$(DESTDIR)" ] ; then \ | 285 | @if [ -z "$(DESTDIR)" ] ; then \ |
288 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ | 286 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ |
289 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ | 287 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ |
290 | else \ | 288 | else \ |