diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2006-03-18 11:01:06 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2006-03-18 11:01:06 +0000 |
| commit | fcaa46686526e922aef13d3b61c4835eaefcb319 (patch) | |
| tree | 2576d8540d5dd1d2a729ba3f81c42c1d654bf745 | |
| parent | 73b06dcb66ea3164c5bcfc9c91956f786acf108a (diff) | |
| download | src-fcaa46686526e922aef13d3b61c4835eaefcb319.tar.gz src-fcaa46686526e922aef13d3b61c4835eaefcb319.zip | |
Provide alternate default for SHLIBDIR before bsd.own.mk does this.
Reported by: phk
Notes
Notes:
svn path=/head/; revision=156837
| -rw-r--r-- | lib/libc/Makefile | 3 | ||||
| -rw-r--r-- | lib/libcrypt/Makefile | 3 | ||||
| -rw-r--r-- | lib/libipsec/Makefile | 3 | ||||
| -rw-r--r-- | lib/libncurses/Makefile | 3 | ||||
| -rw-r--r-- | lib/ncurses/ncurses/Makefile | 3 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 70d48c9c7aa5..247e60216ea4 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,6 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # $FreeBSD$ +SHLIBDIR?= /lib + .include <bsd.own.mk> # All library objects contain FreeBSD revision strings by default; they may be @@ -13,7 +15,6 @@ LIB=c # If you bump SHLIB_MAJOR, remove the kluge from gen/gethostname.c. # If you bump SHLIB_MAJOR, see standards/55112. SHLIB_MAJOR= 6 -SHLIBDIR?= /lib WARNS?= 2 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 8dd31b406b88..3a27e7012081 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -2,11 +2,12 @@ # $FreeBSD$ # +SHLIBDIR?= /lib + .include <bsd.own.mk> SHLIB_MAJOR= 3 LIB= crypt -SHLIBDIR?= /lib .PATH: ${.CURDIR}/../libmd SRCS= crypt.c misc.c \ diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile index 542310c33a2a..62562cd47e1d 100644 --- a/lib/libipsec/Makefile +++ b/lib/libipsec/Makefile @@ -27,10 +27,11 @@ # # $FreeBSD$ +SHLIBDIR?= /lib + .include <bsd.own.mk> LIB= ipsec -SHLIBDIR?= /lib SHLIB_MAJOR= 2 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index aa541eacea58..488a2fcf97e5 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -1,11 +1,12 @@ # $FreeBSD$ +SHLIBDIR?= /lib + .include <bsd.own.mk> NCURSES=${.CURDIR}/../../contrib/ncurses LIB= ncurses -SHLIBDIR?= /lib SHLIB_MAJOR=6 # Should be elsewhere diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index aa541eacea58..488a2fcf97e5 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -1,11 +1,12 @@ # $FreeBSD$ +SHLIBDIR?= /lib + .include <bsd.own.mk> NCURSES=${.CURDIR}/../../contrib/ncurses LIB= ncurses -SHLIBDIR?= /lib SHLIB_MAJOR=6 # Should be elsewhere diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 8dbd0e50f421..ca143e1e6dd4 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ +SHLIBDIR?= /lib + .include <bsd.own.mk> LIB= crypto -SHLIBDIR?= /lib SHLIB_MAJOR= 4 NO_LINT= |