Skip to content

Commit

Permalink
Enforce overwritting SHLIBDIR
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@bapt
bapt committed Jun 15, 2015
1 parent 2f16538 commit 4232f82
Show file tree
Hide file tree
Showing 35 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion cddl/lib/Makefile.inc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib
SHLIB_MAJOR?= 2

.include "../Makefile.inc"
2 changes: 1 addition & 1 deletion gnu/lib/libgcc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs

SHLIB_NAME= libgcc_s.so.1
SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>
#
Expand Down
2 changes: 1 addition & 1 deletion gnu/lib/libssp/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib

MK_PROFILE= no
MK_SSP= no
Expand Down
2 changes: 1 addition & 1 deletion lib/libalias/libalias/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/libalias/modules/Makefile.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.PATH: ${.CURDIR}/../../../../sys/netinet/libalias

SHLIBDIR?= /lib
SHLIBDIR= /lib
LIB?= alias_${NAME}
SHLIB_NAME?=libalias_${NAME}.so
WARNS?= 1
2 changes: 1 addition & 1 deletion lib/libbegemot/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libcam/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/libcapsicum/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
LIB= capsicum

SHLIB_MAJOR= 0
SHLIBDIR?= /lib
SHLIBDIR= /lib

SRCS= libcapsicum.c
SRCS+= libcapsicum_dns.c
Expand Down
2 changes: 1 addition & 1 deletion lib/libcasper/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
LIB= casper

SHLIB_MAJOR= 0
SHLIBDIR?= /lib
SHLIBDIR= /lib

SRCS= libcasper.c
INCS= libcasper.h
Expand Down
2 changes: 1 addition & 1 deletion lib/libcrypt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$
#

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libcxxrt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
SRCDIR= ${.CURDIR}/../../contrib/libcxxrt

SHLIB_MAJOR= 1
SHLIBDIR?= /lib
SHLIBDIR= /lib

.PATH: ${SRCDIR}

Expand Down
2 changes: 1 addition & 1 deletion lib/libedit/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion lib/libexpat/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/libgeom/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

LIB= geom
SHLIBDIR?= /lib
SHLIBDIR= /lib
SRCS+= geom_getxml.c
SRCS+= geom_stats.c
SRCS+= geom_xml2tree.c
Expand Down
2 changes: 1 addition & 1 deletion lib/libipsec/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libjail/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

LIB= jail
SHLIBDIR?= /lib
SHLIBDIR= /lib
SHLIB_MAJOR= 1
SRCS= jail.c jail_getid.c
INCS= jail.h
Expand Down
2 changes: 1 addition & 1 deletion lib/libkiconv/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libkvm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CFLAGS+=-DCROSS_LIBKVM
LIB= kvm
.endif

SHLIBDIR?= /lib
SHLIBDIR= /lib
SHLIB_MAJOR= 6
CFLAGS+=-DLIBC_SCCS -I${.CURDIR}

Expand Down
2 changes: 1 addition & 1 deletion lib/libmd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion lib/libmt/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

LIB= mt
SHLIBDIR?= /lib
SHLIBDIR= /lib
SRCS= mtlib.c
INCS= mtlib.h

Expand Down
2 changes: 1 addition & 1 deletion lib/libnv/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libpcap/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile for libpcap
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libpjdlog/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$
#

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <bsd.own.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libsbuf/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

LIB= sbuf
SHLIBDIR?= /lib
SHLIBDIR= /lib
SRCS= subr_prf.c subr_sbuf.c

SHLIB_MAJOR = 6
Expand Down
2 changes: 1 addition & 1 deletion lib/libthr/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the
# system call stubs.

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>
MK_SSP= no
Expand Down
2 changes: 1 addition & 1 deletion lib/libufs/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/libulog/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

SHLIBDIR?=/lib
SHLIBDIR=/lib

.include <src.opts.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libutil/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib

.include <src.opts.mk>

Expand Down
2 changes: 1 addition & 1 deletion lib/libxo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LIBXO= ${.CURDIR:H:H}/contrib/libxo
LIB= xo
SHLIB_MAJOR=0

SHLIBDIR?= /lib
SHLIBDIR= /lib

SRCS= libxo.c

Expand Down
2 changes: 1 addition & 1 deletion lib/libz/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

LIB= z
SHLIBDIR?= /lib
SHLIBDIR= /lib
SHLIB_MAJOR= 6
MAN= zlib.3 zopen.3

Expand Down
2 changes: 1 addition & 1 deletion lib/msun/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion lib/ncurses/ncurses/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib

.if !defined(ENABLE_WIDEC)
# Override any MAN= setting below..
Expand Down
2 changes: 1 addition & 1 deletion sbin/geom/class/Makefile.inc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

SHLIBDIR?=${GEOM_CLASS_DIR}
SHLIBDIR=${GEOM_CLASS_DIR}
SHLIB_NAME?=geom_${GEOM_CLASS}.so
LINKS= ${BINDIR}/geom ${BINDIR}/g${GEOM_CLASS}
MAN= g${GEOM_CLASS}.8
Expand Down
2 changes: 1 addition & 1 deletion secure/lib/libcrypto/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

SHLIBDIR?= /lib
SHLIBDIR= /lib
SUBDIR= engines

.include <bsd.own.mk>
Expand Down

0 comments on commit 4232f82

Please sign in to comment.