diff options
| author | asami <asami@FreeBSD.org> | 1997-08-05 03:49:49 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1997-08-05 03:49:49 +0000 |
| commit | f48e1d0fca051d42e03388b3c3c3c8eabe997b35 (patch) | |
| tree | 0a38830b7415016820c510b353f87c753819e81d /share/mk | |
| parent | 96aaabc3204fc43e899dcdcc403a5ca63fbc21fa (diff) | |
| download | FreeBSD-src-f48e1d0fca051d42e03388b3c3c3c8eabe997b35.zip FreeBSD-src-f48e1d0fca051d42e03388b3c3c3c8eabe997b35.tar.gz | |
Merge buildworld/installworld patch to Makefile from RELENG_2_2. Patch
a couple *.mk files to enable -current world building on really old
machines (e.g., 2.1.5).
Reviewed by: too many many people to list here, special thanks to bde
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.lib.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 0fd7633..648de6a 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.58 1997/06/18 03:39:34 asami Exp $ +# $Id: bsd.lib.mk,v 1.59 1997/06/21 15:40:32 jkh Exp $ # .if exists(${.CURDIR}/../Makefile.inc) @@ -186,10 +186,12 @@ _EXTRADEPEND:: > $$TMP; \ mv $$TMP ${DEPENDFILE} .endif +.if !defined(NOEXTRADEPEND) _EXTRADEPEND:: echo lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: \ `${LDDESTDIRENV} ${CC} -shared -Wl,-f ${LDDESTDIR} ${LDADD}` \ >> ${DEPENDFILE} +.endif .if !target(install) .if !target(beforeinstall) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 8e39cd4..febc393 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.52 1997/06/28 08:14:10 pst Exp $ +# $Id: bsd.prog.mk,v 1.53 1997/07/31 06:12:04 asami Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -63,7 +63,7 @@ clean: _SUBDIR .endif .endif -.if defined(PROG) +.if defined(PROG) && !defined(NOEXTRADEPEND) _EXTRADEPEND: echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} ${LDDESTDIR} \ ${LDADD:S/^/-Wl,/}` >> ${DEPENDFILE} |
