diff options
author | Ruslan Ermilov <ru@FreeBSD.org> | 2007-10-20 19:01:50 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@FreeBSD.org> | 2007-10-20 19:01:50 +0000 |
commit | 4f6d329f1e26aba171422d5c4bffc837a14f76c1 (patch) | |
tree | ed5ca36d008b8deb749d62d3a799fb9af7a66c0f | |
parent | 2e0a54d6c013c07a4693ab073ef34eb4c403dfd3 (diff) | |
download | src-4f6d329f1e26aba171422d5c4bffc837a14f76c1.tar.gz src-4f6d329f1e26aba171422d5c4bffc837a14f76c1.zip |
- 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
Notes
Notes:
svn path=/head/; revision=172832
-rw-r--r-- | lib/libpam/modules/pam_unix/Makefile | 1 | ||||
-rw-r--r-- | lib/ncurses/ncurses/Makefile | 2 | ||||
-rw-r--r-- | share/mk/bsd.lib.mk | 2 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 2 | ||||
-rw-r--r-- | usr.bin/lex/lib/Makefile | 2 |
5 files changed, 7 insertions, 2 deletions
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile index fd48360341fc..7235a51e868c 100644 --- a/lib/libpam/modules/pam_unix/Makefile +++ b/lib/libpam/modules/pam_unix/Makefile @@ -35,6 +35,7 @@ # $FreeBSD$ NO_PROFILE= +NO_INSTALLLIB= .include <bsd.own.mk> LIB= pam_unix diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index b619f5175f27..e26922dd14c5 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -280,7 +280,7 @@ INCS= ${HEADERS} ${SRCHDRS} INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h .endif -.if !defined(NO_INSTALLLIB) +.if ${MK_INSTALLLIB} != "no" SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermcap${LIB_SUFFIX}.a SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermlib${LIB_SUFFIX}.a diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index cf8079721b22..3a4292519736 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 f61b53e99ba2..4e0491a5c803 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 \ diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile index f94eaab03d02..dcc75185c044 100644 --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -6,8 +6,10 @@ LIB= ln SRCS= libmain.c libyywrap.c NO_PIC= +.if ${MK_INSTALLLIB} != "no" LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a +.endif .if ${MK_PROFILE} != "no" LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a |