- 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
This commit is contained in:
parent
2e0a54d6c0
commit
4f6d329f1e
@ -35,6 +35,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
NO_PROFILE=
|
||||
NO_INSTALLLIB=
|
||||
.include <bsd.own.mk>
|
||||
|
||||
LIB= pam_unix
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user