From cd693f2b4cd1d8b8efb89df4b2ef04253ecccb2c Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 16 Jul 2001 03:31:55 +0000
Subject: MFC: init no longer needs the magic to look into the internals of the
 libscrypt/libdescrypt builds since libcrypt is unified now.

---
 sbin/init/Makefile | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

(limited to 'sbin/init')

diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index ddf2f50f4edf..a48e90c64c27 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -7,31 +7,8 @@ MLINKS=	init.8 securelevel.8
 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(${.OBJDIR}/../../lib/libcrypt)
-SCRYPTOBJDIR=	${.OBJDIR}/../../lib/libcrypt
-.else
-SCRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt
-.endif
-
-.if exists (${.CURDIR}/../../secure)
-
-.if exists(${.OBJDIR}/../../secure/lib/libcrypt)
-DESCRYPTOBJDIR=	${.OBJDIR}/../../secure/lib/libcrypt
-.else
-DESCRYPTOBJDIR=	${.CURDIR}/../../secure/lib/libcrypt
-.endif
-
-.endif
+DPADD=	${LIBUTIL} ${LIBCRYPT}
+LDADD=	-lutil -lcrypt
 
 beforeinstall:
 .if exists(${DESTDIR}${BINDIR}/${PROG})
-- 
cgit v1.3