diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 52 |
1 files changed, 19 insertions, 33 deletions
diff --git a/Makefile.in b/Makefile.in index 2f6f9818e..6ce95c616 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -61,6 +61,7 @@ XAUTH_PATH=@XAUTH_PATH@ | |||
61 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | 61 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ |
62 | EXEEXT=@EXEEXT@ | 62 | EXEEXT=@EXEEXT@ |
63 | MANFMT=@MANFMT@ | 63 | MANFMT=@MANFMT@ |
64 | MKDIR_P=@MKDIR_P@ | ||
64 | 65 | ||
65 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) | 66 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) |
66 | 67 | ||
@@ -310,14 +311,13 @@ check-config: | |||
310 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config | 311 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config |
311 | 312 | ||
312 | install-files: | 313 | install-files: |
313 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) | 314 | $(MKDIR_P) $(DESTDIR)$(bindir) |
314 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) | 315 | $(MKDIR_P) $(DESTDIR)$(sbindir) |
315 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) | 316 | $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)1 |
316 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 | 317 | $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
317 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 | 318 | $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
318 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 | 319 | $(MKDIR_P) $(DESTDIR)$(libexecdir) |
319 | $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) | 320 | $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
320 | (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)) | ||
321 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) | 321 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
322 | $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) | 322 | $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
323 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) | 323 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) |
@@ -345,9 +345,7 @@ install-files: | |||
345 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 345 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
346 | 346 | ||
347 | install-sysconf: | 347 | install-sysconf: |
348 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | 348 | $(MKDIR_P) $(DESTDIR)$(sysconfdir) |
349 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ | ||
350 | fi | ||
351 | @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ | 349 | @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ |
352 | $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ | 350 | $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ |
353 | else \ | 351 | else \ |
@@ -418,28 +416,16 @@ uninstall: | |||
418 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 416 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
419 | 417 | ||
420 | regress-prep: | 418 | regress-prep: |
421 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress | 419 | $(MKDIR_P) `pwd`/regress/unittests/test_helper |
422 | [ -d `pwd`/regress/unittests ] || mkdir -p `pwd`/regress/unittests | 420 | $(MKDIR_P) `pwd`/regress/unittests/sshbuf |
423 | [ -d `pwd`/regress/unittests/test_helper ] || \ | 421 | $(MKDIR_P) `pwd`/regress/unittests/sshkey |
424 | mkdir -p `pwd`/regress/unittests/test_helper | 422 | $(MKDIR_P) `pwd`/regress/unittests/bitmap |
425 | [ -d `pwd`/regress/unittests/sshbuf ] || \ | 423 | $(MKDIR_P) `pwd`/regress/unittests/conversion |
426 | mkdir -p `pwd`/regress/unittests/sshbuf | 424 | $(MKDIR_P) `pwd`/regress/unittests/hostkeys |
427 | [ -d `pwd`/regress/unittests/sshkey ] || \ | 425 | $(MKDIR_P) `pwd`/regress/unittests/kex |
428 | mkdir -p `pwd`/regress/unittests/sshkey | 426 | $(MKDIR_P) `pwd`/regress/unittests/match |
429 | [ -d `pwd`/regress/unittests/bitmap ] || \ | 427 | $(MKDIR_P) `pwd`/regress/unittests/utf8 |
430 | mkdir -p `pwd`/regress/unittests/bitmap | 428 | $(MKDIR_P) `pwd`/regress/misc/kexfuzz |
431 | [ -d `pwd`/regress/unittests/conversion ] || \ | ||
432 | mkdir -p `pwd`/regress/unittests/conversion | ||
433 | [ -d `pwd`/regress/unittests/hostkeys ] || \ | ||
434 | mkdir -p `pwd`/regress/unittests/hostkeys | ||
435 | [ -d `pwd`/regress/unittests/kex ] || \ | ||
436 | mkdir -p `pwd`/regress/unittests/kex | ||
437 | [ -d `pwd`/regress/unittests/match ] || \ | ||
438 | mkdir -p `pwd`/regress/unittests/match | ||
439 | [ -d `pwd`/regress/unittests/utf8 ] || \ | ||
440 | mkdir -p `pwd`/regress/unittests/utf8 | ||
441 | [ -d `pwd`/regress/misc/kexfuzz ] || \ | ||
442 | mkdir -p `pwd`/regress/misc/kexfuzz | ||
443 | [ -f `pwd`/regress/Makefile ] || \ | 429 | [ -f `pwd`/regress/Makefile ] || \ |
444 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile | 430 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile |
445 | 431 | ||