summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>1997-02-10 17:44:34 +0000
committermarkm <markm@FreeBSD.org>1997-02-10 17:44:34 +0000
commit7c4a46a3a0d231d6f26abeb0dec447ec8fa3a45c (patch)
tree5413662d40dd3b4c6810adc506bc977abc8d32e7
parent5b3185bcd6e63cae5fdc9d5f973073c884b9e9db (diff)
downloadFreeBSD-src-7c4a46a3a0d231d6f26abeb0dec447ec8fa3a45c.zip
FreeBSD-src-7c4a46a3a0d231d6f26abeb0dec447ec8fa3a45c.tar.gz
Part two of a "fix-and-move". There were some macros declared in ../sbin's
Makefile that were a) broken and b) bogusly placed. This brings the repeared macros in. Pointed-out-by: BDE
-rw-r--r--sbin/init/Makefile16
1 files changed, 16 insertions, 0 deletions
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index f566f88..1d8c89c 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -17,3 +17,19 @@ LDADD= -lutil -L${SCRYPTOBJDIR} -lscrypt
.endif
.include <bsd.prog.mk>
+
+.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
OpenPOWER on IntegriCloud