From f422bef2573abeb7557bc6f2190ff5ca76e4a8f6 Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Tue, 2 Feb 1999 18:34:23 +0000 Subject: [PATCH] Use the bsd.kern.mk from the source tree rather than the installed one if possible. --- sys/alpha/conf/Makefile.alpha | 6 +++++- sys/conf/Makefile.alpha | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha index 99f61697f914..6ffa507a03b6 100644 --- a/sys/alpha/conf/Makefile.alpha +++ b/sys/alpha/conf/Makefile.alpha @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $Id: Makefile.alpha,v 1.15 1998/12/17 22:36:21 dfr Exp $ +# $Id: Makefile.alpha,v 1.16 1999/01/09 21:50:59 jdp Exp $ # # Makefile for FreeBSD # @@ -282,7 +282,11 @@ vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src sh $S/kern/vnode_if.sh $S/kern/vnode_if.src +.if exists($S/../share/mk) +.include "$S/../share/mk/bsd.kern.mk" +.else .include +.endif %RULES diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 99f61697f914..6ffa507a03b6 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $Id: Makefile.alpha,v 1.15 1998/12/17 22:36:21 dfr Exp $ +# $Id: Makefile.alpha,v 1.16 1999/01/09 21:50:59 jdp Exp $ # # Makefile for FreeBSD # @@ -282,7 +282,11 @@ vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src sh $S/kern/vnode_if.sh $S/kern/vnode_if.src +.if exists($S/../share/mk) +.include "$S/../share/mk/bsd.kern.mk" +.else .include +.endif %RULES