diff options
| -rw-r--r-- | lib/libncurses/Makefile | 2 | ||||
| -rw-r--r-- | lib/libpam/modules/Makefile.inc | 2 | ||||
| -rw-r--r-- | lib/ncurses/ncurses/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/bsd.compat.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.lib.mk | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index 38334cc..3d7dcce 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -227,7 +227,7 @@ CLEANFILES+= ${GENSRC} ${GENHDR} keys.list make_hash term.h.new \ make_keys MKterm.h.awk comp_captab.c curses.head \ namehdr nameftr codeftr ${NAMESRC} ${CODESRC} -.if !defined(NOINSTALLLIB) +.if !defined(NO_INSTALLLIB) SYMLINKS+=libncurses.a ${LIBDIR}/libcurses.a SYMLINKS+=libncurses.a ${LIBDIR}/libtermcap.a SYMLINKS+=libncurses.a ${LIBDIR}/libtermlib.a diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index 317b3fe..d4f2bb3 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -2,7 +2,7 @@ PAMDIR= ${.CURDIR}/../../../../contrib/openpam -NOINSTALLLIB= +NO_INSTALLLIB= NO_PROFILE= CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 38334cc..3d7dcce 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -227,7 +227,7 @@ CLEANFILES+= ${GENSRC} ${GENHDR} keys.list make_hash term.h.new \ make_keys MKterm.h.awk comp_captab.c curses.head \ namehdr nameftr codeftr ${NAMESRC} ${CODESRC} -.if !defined(NOINSTALLLIB) +.if !defined(NO_INSTALLLIB) SYMLINKS+=libncurses.a ${LIBDIR}/libcurses.a SYMLINKS+=libncurses.a ${LIBDIR}/libtermcap.a SYMLINKS+=libncurses.a ${LIBDIR}/libtermlib.a diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 522dc5c..6953957 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -7,6 +7,7 @@ NOEXTRADEPEND:NO_EXTRADEPEND \ NOINFO:NO_INFO \ NOINFOCOMPRESS:NO_INFOCOMPRESS \ + NOINSTALLLIB:NO_INSTALLLIB \ NOLIBC_R:NO_LIBC_R \ NOLIBPTHREAD:NO_LIBPTHREAD \ NOLIBTHR:NO_LIBTHR \ diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index e0e2967..61b8da5 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -207,7 +207,7 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} realinstall: _libinstall .ORDER: beforeinstall _libinstall _libinstall: -.if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB) +.if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .endif |
