diff options
| author | jdp <jdp@FreeBSD.org> | 1999-01-22 12:41:27 +0000 |
|---|---|---|
| committer | jdp <jdp@FreeBSD.org> | 1999-01-22 12:41:27 +0000 |
| commit | d149f7d8f98c787fe98a73bfb80e4f47195ed035 (patch) | |
| tree | d5eede9f38eda120bdc774f01a1c582a2371c14f | |
| parent | 6f61fb4448238197dd556193dadcbd9d832453a6 (diff) | |
| download | FreeBSD-src-d149f7d8f98c787fe98a73bfb80e4f47195ed035.zip FreeBSD-src-d149f7d8f98c787fe98a73bfb80e4f47195ed035.tar.gz | |
Introduce a new variable NEED_LIBNAMES. If it is defined,
<bsd.libnames.mk> is included regardless of the object file format.
This is needed to fix the a.out PAM breakage that manifests itself
when trying to build login.
| -rw-r--r-- | share/mk/bsd.lib.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 0bfc484..aea0ff2 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $Id: bsd.lib.mk,v 1.83 1999/01/09 21:50:58 jdp Exp $ +# $Id: bsd.lib.mk,v 1.84 1999/01/20 21:42:40 jdp Exp $ # .if !target(__initialized__) @@ -50,7 +50,7 @@ CFLAGS+= ${DEBUG_FLAGS} STRIP?= -s .endif -.if ${OBJFORMAT} != aout || make(checkdpadd) +.if ${OBJFORMAT} != aout || make(checkdpadd) || defined(NEED_LIBNAMES) .include <bsd.libnames.mk> .endif diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 783192d..b8b3a7c 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.prog.mk,v 1.79 1998/10/18 09:35:17 obrien Exp $ +# $Id: bsd.prog.mk,v 1.80 1998/12/06 17:14:37 bde Exp $ .if !target(__initialized__) __initialized__: @@ -156,7 +156,7 @@ all-man: regress: .endif -.if ${OBJFORMAT} != aout || make(checkdpadd) +.if ${OBJFORMAT} != aout || make(checkdpadd) || defined(NEED_LIBNAMES) .include <bsd.libnames.mk> .endif |
