diff options
| author | Joerg Wunsch <joerg@FreeBSD.org> | 1996-11-24 09:31:43 +0000 |
|---|---|---|
| committer | Joerg Wunsch <joerg@FreeBSD.org> | 1996-11-24 09:31:43 +0000 |
| commit | f54ce65bb92b3e103ea891edc7fcfae0b9a4dc5a (patch) | |
| tree | fbe2aab3c372668b78f698a5dd225525f571aaf7 | |
| parent | ac613515db8f0abb07ec0c829972887b9dda08b7 (diff) | |
Notes
| -rw-r--r-- | bin/Makefile.inc | 11 | ||||
| -rw-r--r-- | bin/ed/Makefile | 11 | ||||
| -rw-r--r-- | sbin/Makefile.inc | 16 | ||||
| -rw-r--r-- | sbin/init/Makefile | 12 |
4 files changed, 46 insertions, 4 deletions
diff --git a/bin/Makefile.inc b/bin/Makefile.inc index 4760782bef05..b053cc93d6dc 100644 --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -1,4 +1,15 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 +# $Id: Makefile.inc,v 1.7 1996/09/22 21:51:04 wosch Exp $ BINDIR?= /bin NOSHARED?= YES + +.if exists (${.CURDIR}/../../secure) + +.if exists(${.CURDIR}/../../secure/lib/libcipher/obj) +CIPHEROBJDIR= ${.CURDIR}/../../secure/lib/libcipher/obj +.else +CIPHEROBJDIR= ${.CURDIR}/../../secure/lib/libcipher +.endif + +.endif diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 7da27f20079f..560aba0dfc9f 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,8 +1,15 @@ -# $Id: Makefile,v 1.10 1994/12/18 15:15:10 jkh Exp $ +# $Id: Makefile,v 1.13 1995/10/22 20:14:13 ache Exp $ PROG= ed -SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 +.if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) +DISTRIBUTION=des +CFLAGS+=-DDES +LDADD+= -L${CIPHEROBJDIR} -lcipher +DPADD+= ${CIPHEROBJDIR}/libcipher.a +.endif + .include <bsd.prog.mk> diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc index 470d8699327e..71c943843d80 100644 --- a/sbin/Makefile.inc +++ b/sbin/Makefile.inc @@ -2,3 +2,19 @@ BINDIR?= /sbin NOSHARED?= YES + +.if exists(${.CURDIR}/../../lib/libcrypt/obj) +SCRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj +.else +SCRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt +.endif + +.if exists (${.CURDIR}/../../secure) + +.if exists(${.CURDIR}/../../secure/lib/libcrypt/obj) +DESCRYPTOBJDIR= ${.CURDIR}/../../secure/lib/libcrypt/obj +.else +DESCRYPTOBJDIR= ${.CURDIR}/../../secure/lib/libcrypt +.endif + +.endif diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 7acd065f615c..8a0fd04549a4 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -1,11 +1,19 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 +# $Id: Makefile,v 1.8 1996/09/05 17:14:50 bde Exp $ PROG= init MAN8= init.8 -DPADD= ${LIBUTIL} -LDADD= -lutil -lcrypt BINMODE=500 INSTALLFLAGS=-fschg CFLAGS+=-DDEBUGSHELL -DSECURE +.if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) +DISTRIBUTION=des +DPADD= ${LIBUTIL} ${DESCRYPTOBJDIR}/libdescrypt.a +LDADD= -lutil -L${DESCRYPTOBJDIR} -ldescrypt +.else +DPADD= ${LIBUTIL} ${SCRYPTOBJDIR}/libscrypt.a +LDADD= -lutil -L${SCRYPTOBJDIR} -lscrypt +.endif + .include <bsd.prog.mk> |