From db64b4a4bcc907ff32d7d6e08c3b68229edbb051 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Sat, 20 Oct 2007 19:01:50 +0000
Subject: - 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
---
 share/mk/bsd.lib.mk | 2 +-
 share/mk/bsd.own.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'share')

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 \
-- 
cgit v1.1