diff options
36 files changed, 37 insertions, 35 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 1679404..edbda98 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -451,6 +451,8 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ CXX="${XCXX} ${LIB32FLAGS}" \ DESTDIR=${LIB32TMP} \ + SHLIBDIR=/usr/lib32 \ + LIBDIR=/usr/lib32 \ -DCOMPAT_32BIT \ -DLIBRARIES_ONLY \ -DNO_CPU_CFLAGS \ diff --git a/cddl/lib/Makefile.inc b/cddl/lib/Makefile.inc index d8f6c20..8f9af1d 100644 --- a/cddl/lib/Makefile.inc +++ b/cddl/lib/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR?= 2 .include "../Makefile.inc" diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 13c1585..f0efff4 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -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> # diff --git a/gnu/lib/libssp/Makefile b/gnu/lib/libssp/Makefile index 20cec04..5a41298 100644 --- a/gnu/lib/libssp/Makefile +++ b/gnu/lib/libssp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib MK_PROFILE= no MK_SSP= no diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile index f098e74..00b4ed8 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 18bdd64..23df02d 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 ed22586..27baf56 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 e8035f0..b6d3f9f 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 <src.opts.mk> diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile index 2ba4080..c448369 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 15ee299..6ee5bb8 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 711d233..e57accd 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 5999137..85bf948 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -SHLIBDIR= /lib +SHLIBDIR?= /lib .include <src.opts.mk> diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile index 812b773..d197361 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 d957d3c..8a97ce0 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 c344903..0d4bef5 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 6785099..20b7a4c 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 1d70bc5..7d3e94a 100644 --- a/lib/libipsec/Makefile +++ b/lib/libipsec/Makefile @@ -27,7 +27,7 @@ # # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include <src.opts.mk> diff --git a/lib/libjail/Makefile b/lib/libjail/Makefile index 3525ed6..442274a 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 df29a5d..c7b2179 100644 --- a/lib/libkiconv/Makefile +++ b/lib/libkiconv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include <src.opts.mk> diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile index f9bda38..4608254 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 79c828c..61bea29 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 695e953..6fe5920 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 717c3d6..8b2fc78 100644 --- a/lib/libnv/Makefile +++ b/lib/libnv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include <src.opts.mk> diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index db7d39f..c36b3ef 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,7 +1,7 @@ # Makefile for libpcap # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include <src.opts.mk> diff --git a/lib/libpjdlog/Makefile b/lib/libpjdlog/Makefile index dc2b435..e44f53b 100644 --- a/lib/libpjdlog/Makefile +++ b/lib/libpjdlog/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -SHLIBDIR= /lib +SHLIBDIR?= /lib .include <bsd.own.mk> diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile index 9abe780..98ceeb6 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 4ad37cc..1717672 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 <src.opts.mk> MK_SSP= no diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile index a04afaa..24efd0c 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 10b8312..fedd114 100644 --- a/lib/libulog/Makefile +++ b/lib/libulog/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR=/lib +SHLIBDIR?=/lib .include <src.opts.mk> diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index 7b20e30..35d146a 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 <src.opts.mk> diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile index 04558a3..62fface 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 3f13988..1f9bb72 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 389ed74..094fcba 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 f02cfc7..31c68cd 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.. diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc index 0082f92..06b733f 100644 --- a/sbin/geom/class/Makefile.inc +++ b/sbin/geom/class/Makefile.inc @@ -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 diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index a167173..dbe2157 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib SUBDIR= engines .include <bsd.own.mk> |