aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2001-01-01 21:39:00 +0000
committerPeter Wemm <peter@FreeBSD.org>2001-01-01 21:39:00 +0000
commit623d7cd30e5b11373b8f2d7ca36513c5075e68ff (patch)
tree6d9d89f943b7560bfcd7b3020dc7a0908a9ab2f3 /sbin
parent29931e84547285f770ec8dbb1bbd0301cad74e2a (diff)
downloadsrc-623d7cd30e5b11373b8f2d7ca36513c5075e68ff.tar.gz
src-623d7cd30e5b11373b8f2d7ca36513c5075e68ff.zip
Further tidy up the sbin/init and release builds.
Notes
Notes: svn path=/head/; revision=70565
Diffstat (limited to 'sbin')
-rw-r--r--sbin/init/Makefile30
1 files changed, 2 insertions, 28 deletions
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 7b9547daabbe..83488c145e02 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -7,34 +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
-
-DPADD= ${LIBUTIL} ${SCRYPTOBJDIR}/libcrypt.a
-LDADD= -lutil -L${SCRYPTOBJDIR} -lcrypt
-
-.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})