From 9fb85ece8b4762e6e233907d48c333aba4b450b7 Mon Sep 17 00:00:00 2001 From: bapt Date: Mon, 15 Jun 2015 15:34:20 +0000 Subject: Enforce overwritting SHLIBDIR Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends load loading bsd.own.mk which then defines SHLIBDIR before all the Makefile.inc everywhere. This makes /lib being populated again. Reported by: many --- lib/libalias/libalias/Makefile | 2 +- lib/libalias/modules/Makefile.inc | 2 +- lib/libbegemot/Makefile | 2 +- lib/libc/Makefile | 2 +- lib/libcam/Makefile | 2 +- lib/libcapsicum/Makefile | 2 +- lib/libcasper/Makefile | 2 +- lib/libcrypt/Makefile | 2 +- lib/libcxxrt/Makefile | 2 +- lib/libedit/Makefile | 2 +- lib/libexpat/Makefile | 2 +- lib/libgeom/Makefile | 2 +- lib/libipsec/Makefile | 2 +- lib/libjail/Makefile | 2 +- lib/libkiconv/Makefile | 2 +- lib/libkvm/Makefile | 2 +- lib/libmd/Makefile | 2 +- lib/libmt/Makefile | 2 +- lib/libnv/Makefile | 2 +- lib/libpcap/Makefile | 2 +- lib/libpjdlog/Makefile | 2 +- lib/libsbuf/Makefile | 2 +- lib/libthr/Makefile | 2 +- lib/libufs/Makefile | 2 +- lib/libulog/Makefile | 2 +- lib/libutil/Makefile | 2 +- lib/libxo/Makefile | 2 +- lib/libz/Makefile | 2 +- lib/msun/Makefile | 2 +- lib/ncurses/ncurses/Makefile | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) (limited to 'lib') diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile index 00b4ed8..f098e74 100644 --- a/lib/libalias/libalias/Makefile +++ b/lib/libalias/libalias/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../sys/netinet/libalias LIB= alias -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 7 MAN= libalias.3 SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c diff --git a/lib/libalias/modules/Makefile.inc b/lib/libalias/modules/Makefile.inc index 23df02d..18bdd64 100644 --- a/lib/libalias/modules/Makefile.inc +++ b/lib/libalias/modules/Makefile.inc @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias -SHLIBDIR?= /lib +SHLIBDIR= /lib LIB?= alias_${NAME} SHLIB_NAME?=libalias_${NAME}.so WARNS?= 1 diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile index 27baf56..ed22586 100644 --- a/lib/libbegemot/Makefile +++ b/lib/libbegemot/Makefile @@ -6,7 +6,7 @@ LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot LIB= begemot SHLIB_MAJOR= 4 -SHLIBDIR?= /lib +SHLIBDIR= /lib CFLAGS+= -DUSE_SELECT -DQUADFMT='"ll"' SRCS= rpoll.c diff --git a/lib/libc/Makefile b/lib/libc/Makefile index b6d3f9f..e8035f0 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile index c448369..2ba4080 100644 --- a/lib/libcam/Makefile +++ b/lib/libcam/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= cam -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ ata_all.c smp_all.c INCS= camlib.h diff --git a/lib/libcapsicum/Makefile b/lib/libcapsicum/Makefile index 6ee5bb8..15ee299 100644 --- a/lib/libcapsicum/Makefile +++ b/lib/libcapsicum/Makefile @@ -3,7 +3,7 @@ LIB= capsicum SHLIB_MAJOR= 0 -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= libcapsicum.c SRCS+= libcapsicum_dns.c diff --git a/lib/libcasper/Makefile b/lib/libcasper/Makefile index e57accd..711d233 100644 --- a/lib/libcasper/Makefile +++ b/lib/libcasper/Makefile @@ -3,7 +3,7 @@ LIB= casper SHLIB_MAJOR= 0 -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= libcasper.c INCS= libcasper.h diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 85bf948..5999137 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -SHLIBDIR?= /lib +SHLIBDIR= /lib .include diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile index d197361..812b773 100644 --- a/lib/libcxxrt/Makefile +++ b/lib/libcxxrt/Makefile @@ -3,7 +3,7 @@ SRCDIR= ${.CURDIR}/../../contrib/libcxxrt SHLIB_MAJOR= 1 -SHLIBDIR?= /lib +SHLIBDIR= /lib .PATH: ${SRCDIR} diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile index 8a97ce0..d957d3c 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -4,7 +4,7 @@ LIB= edit SHLIB_MAJOR= 7 -SHLIBDIR?= /lib +SHLIBDIR= /lib OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \ hist.c keymacro.c map.c chartype.c \ diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile index 0d4bef5..c344903 100644 --- a/lib/libexpat/Makefile +++ b/lib/libexpat/Makefile @@ -3,7 +3,7 @@ EXPAT= ${.CURDIR}/../../contrib/expat LIB= bsdxml -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 4 SRCS= xmlparse.c xmlrole.c xmltok.c INCS= bsdxml.h bsdxml_external.h diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile index 20b7a4c..6785099 100644 --- a/lib/libgeom/Makefile +++ b/lib/libgeom/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= geom -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS+= geom_getxml.c SRCS+= geom_stats.c SRCS+= geom_xml2tree.c diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile index 7d3e94a..1d70bc5 100644 --- a/lib/libipsec/Makefile +++ b/lib/libipsec/Makefile @@ -27,7 +27,7 @@ # # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include diff --git a/lib/libjail/Makefile b/lib/libjail/Makefile index 442274a..3525ed6 100644 --- a/lib/libjail/Makefile +++ b/lib/libjail/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= jail -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 1 SRCS= jail.c jail_getid.c INCS= jail.h diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile index c7b2179..df29a5d 100644 --- a/lib/libkiconv/Makefile +++ b/lib/libkiconv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile index 4608254..f9bda38 100644 --- a/lib/libkvm/Makefile +++ b/lib/libkvm/Makefile @@ -16,7 +16,7 @@ CFLAGS+=-DCROSS_LIBKVM LIB= kvm .endif -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 6 CFLAGS+=-DLIBC_SCCS -I${.CURDIR} diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 61bea29..79c828c 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -2,7 +2,7 @@ LIB= md SHLIB_MAJOR= 6 -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= md4c.c md5c.c md4hl.c md5hl.c \ rmd160c.c rmd160hl.c \ sha0c.c sha0hl.c sha1c.c sha1hl.c \ diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile index 6fe5920..695e953 100644 --- a/lib/libmt/Makefile +++ b/lib/libmt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= mt -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= mtlib.c INCS= mtlib.h diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile index 8b2fc78..717c3d6 100644 --- a/lib/libnv/Makefile +++ b/lib/libnv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index c36b3ef..db7d39f 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,7 +1,7 @@ # Makefile for libpcap # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include diff --git a/lib/libpjdlog/Makefile b/lib/libpjdlog/Makefile index e44f53b..dc2b435 100644 --- a/lib/libpjdlog/Makefile +++ b/lib/libpjdlog/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -SHLIBDIR?= /lib +SHLIBDIR= /lib .include diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile index 98ceeb6..9abe780 100644 --- a/lib/libsbuf/Makefile +++ b/lib/libsbuf/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= sbuf -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= subr_prf.c subr_sbuf.c SHLIB_MAJOR = 6 diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 1717672..4ad37cc 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -8,7 +8,7 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -SHLIBDIR?= /lib +SHLIBDIR= /lib .include MK_SSP= no diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile index 24efd0c..a04afaa 100644 --- a/lib/libufs/Makefile +++ b/lib/libufs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= ufs -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 6 SRCS= block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile index fedd114..10b8312 100644 --- a/lib/libulog/Makefile +++ b/lib/libulog/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?=/lib +SHLIBDIR=/lib .include diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index 35d146a..7b20e30 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile index 62fface..04558a3 100644 --- a/lib/libxo/Makefile +++ b/lib/libxo/Makefile @@ -7,7 +7,7 @@ LIBXO= ${.CURDIR:H:H}/contrib/libxo LIB= xo SHLIB_MAJOR=0 -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= libxo.c diff --git a/lib/libz/Makefile b/lib/libz/Makefile index 1f9bb72..3f13988 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -3,7 +3,7 @@ # LIB= z -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 6 MAN= zlib.3 zopen.3 diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 094fcba..389ed74 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -42,7 +42,7 @@ CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} .PATH: ${.CURDIR}/man LIB= m -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 5 WARNS?= 1 IGNORE_PRAGMA= diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 31c68cd..f02cfc7 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .if !defined(ENABLE_WIDEC) # Override any MAN= setting below.. -- cgit v1.1