From 8440a010774e8a31673a82139dd7e00dffd1c1d9 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Mon, 1 Jan 2001 19:46:43 +0000 Subject: [PATCH] This is not necessarily the correct fix, but at least sbin/init compiles in a sterile environment like "make release" --- sbin/init/Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 39a5efccf96..7b9547daabb 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -8,14 +8,17 @@ BINMODE=500 INSTALLFLAGS=-fschg CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) -DISTRIBUTION=crypto -DPADD= ${LIBUTIL} ${DESCRYPTOBJDIR}/libdescrypt.a -LDADD= -lutil -L${DESCRYPTOBJDIR} -ldescrypt -.else -DPADD= ${LIBUTIL} ${SCRYPTOBJDIR}/libscrypt.a -LDADD= -lutil -L${SCRYPTOBJDIR} -lscrypt -.endif +#.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) +#DISTRIBUTION=crypto +#DPADD= ${LIBUTIL} ${DESCRYPTOBJDIR}/libdescrypt.a +#LDADD= -lutil -L${DESCRYPTOBJDIR} -ldescrypt +#.else +#DPADD= ${LIBUTIL} ${SCRYPTOBJDIR}/libscrypt.a +#LDADD= -lutil -L${SCRYPTOBJDIR} -lscrypt +#.endif + +DPADD= ${LIBUTIL} ${SCRYPTOBJDIR}/libcrypt.a +LDADD= -lutil -L${SCRYPTOBJDIR} -lcrypt .if exists(${.OBJDIR}/../../lib/libcrypt) SCRYPTOBJDIR= ${.OBJDIR}/../../lib/libcrypt