diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-07-05 11:11:02 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-07-05 11:11:02 +0000 |
| commit | 4736edcbe33910fcb9bb881ca3c315fa35c503e1 (patch) | |
| tree | ea276139b81171827a1f9dc79317aaaacbaf0a68 /secure | |
| parent | 3e9b06ba6d6eb1e672a83a9d2c64ae15f692f49b (diff) | |
Notes
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/libexec/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keysign/Makefile | 12 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 3 |
4 files changed, 2 insertions, 17 deletions
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index cd8405bbac94..dba033137bbc 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -4,7 +4,7 @@ SUBDIR= telnetd .endif .if !defined(NO_OPENSSL) && !defined(NO_OPENSSH) -SUBDIR+=sftp-server +SUBDIR+=sftp-server ssh-keysign .endif .include <bsd.subdir.mk> diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index bcc8aa24bb7c..42b8aa2ff2b3 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -7,7 +7,7 @@ SUBDIR+=telnet .if !defined(NO_OPENSSL) SUBDIR+=openssl .if !defined(NO_OPENSSH) -SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan ssh-keysign +SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan .endif .endif diff --git a/secure/usr.bin/ssh-keysign/Makefile b/secure/usr.bin/ssh-keysign/Makefile deleted file mode 100644 index 5fdd6723fc24..000000000000 --- a/secure/usr.bin/ssh-keysign/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -PROG= ssh-keysign -MAN= ssh-keysign.8 -CFLAGS+=-I${SSHDIR} - -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypto -lz - -.include <bsd.prog.mk> - -.PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index d9ba6a7cac47..42964ca52b10 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -3,9 +3,6 @@ PROG= ssh CFLAGS+=-I${SSHDIR} -.if defined(ENABLE_SUID_SSH) -BINMODE=4555 -.endif LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 |