diff options
| author | ru <ru@FreeBSD.org> | 2007-10-20 19:01:50 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2007-10-20 19:01:50 +0000 |
| commit | db64b4a4bcc907ff32d7d6e08c3b68229edbb051 (patch) | |
| tree | ed5ca36d008b8deb749d62d3a799fb9af7a66c0f /share/mk | |
| parent | c5e068d896110d36b2af67fd2901295bcf4c1c76 (diff) | |
| download | FreeBSD-src-db64b4a4bcc907ff32d7d6e08c3b68229edbb051.zip FreeBSD-src-db64b4a4bcc907ff32d7d6e08c3b68229edbb051.tar.gz | |
- Convert NO_INSTALLLIB option to a new syntax: makefiles should
test MK_INSTALLLIB, users can set WITHOUT_INSTALLLIB. The old
NO_INSTALLLIB is still supported as several makefiles set it.
- While here, fix an install when instructed not to install libs
(usr.bin/lex/lib/Makefile).
PR: bin/114200
Submitted by: Henrik Brix Andersen
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.lib.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index cf80797..3a42925 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -235,7 +235,7 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} realinstall: _libinstall .ORDER: beforeinstall _libinstall _libinstall: -.if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB) +.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index f61b53e..4e0491a 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -188,6 +188,7 @@ COMPRESS_EXT?= .gz # regardless of user's setting). # .for var in \ + INSTALLLIB \ MAN \ PROFILE .if defined(NO_${var}) @@ -322,6 +323,7 @@ WITH_IDEA= I4B \ INET6 \ INFO \ + INSTALLLIB \ IPFILTER \ IPX \ KERBEROS \ |
