diff options
| author | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
| commit | 388e590f951441f619cd32710dc151e0ac810a10 (patch) | |
| tree | 801e953598fc63a37f62cf997017301675552fe9 /usr.sbin/pkg_install | |
| parent | a251964eaca5833ff2c4651fe4f7f8cac7199da5 (diff) | |
| download | FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.zip FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.tar.gz | |
Reimplementation of world/kernel build options. For details, see:
http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html
The src.conf(5) manpage is to follow in a few days.
Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)
Diffstat (limited to 'usr.sbin/pkg_install')
| -rw-r--r-- | usr.sbin/pkg_install/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/Makefile.inc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile index e74b5dc..d4a0baf 100644 --- a/usr.sbin/pkg_install/Makefile +++ b/usr.sbin/pkg_install/Makefile @@ -1,8 +1,10 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= lib add create delete info ${_sign} version -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_OPENSSL} != "no" _sign= sign .endif diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc index e27d31a..bff3474 100644 --- a/usr.sbin/pkg_install/Makefile.inc +++ b/usr.sbin/pkg_install/Makefile.inc @@ -1,8 +1,10 @@ # $FreeBSD$ +.include <bsd.own.mk> + LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \ +.if ${MK_OPENSSL} != "no" && \ defined(LDADD) && ${LDADD:M-lfetch} != "" DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto |
