From NetBSD: Merge with NetBSD 960217

1 files changed, 16 insertions, 17 deletions

diff --git a/sys/lib/libkern/Makefile.inc b/sys/lib/libkern/Makefile.inc
index 1c0a003a913..1314ceb54fa 100644
--- a/sys/lib/libkern/Makefile.inc
+++ b/sys/lib/libkern/Makefile.inc
@@ -1,4 +1,5 @@
-#	$NetBSD: Makefile.inc,v 1.12 1995/10/07 09:56:55 mycroft Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 1996/02/29 13:27:48 niklas Exp $
+#	$NetBSD: Makefile.inc,v 1.13 1996/02/02 20:34:41 mycroft Exp $
 #
 #	NOTE: $S must correspond to the top of the 'sys' tree
 
@@ -9,29 +10,27 @@ KERNREL?=	../../
 KERNLIB?=	${KERNDST}/libkern.o
 KERNLIB_PROF=	${KERNDST}/libkern.po
 
+KERNMAKE= \
+	cd ${KERNDST} && ${MAKE} -f ${KERNREL}${KERNDIR}/Makefile \
+	    CC="${CC}" CFLAGS="${CFLAGS}" \
+	    AS="${AS}" AFLAGS="${AFLAGS}" \
+	    LD="${LD}" \
+	    MACHINE="${MACHINE}" MACHINE_ARCH="${MACHINE_ARCH}" \
+	    KERNCPPFLAGS="${CPPFLAGS}" \
+	    KERNREL="${KERNREL}" \
+	    KERNDIR="${KERNDIR}"
+
 ${KERNLIB}:		.NOTMAIN __always_make_kernlib
 	@echo making sure the kern library is up to date...
-	@(cd ${KERNDST} && ${MAKE} -f ${KERNREL}${KERNDIR}/Makefile \
-	  KERNCC="${CC}" \
-	  KERNCFLAGS="${CFLAGS}" \
-	  KERNREL="${KERNREL}" \
-	  KERNDIR="${KERNDIR}" libkern.o)
+	@${KERNMAKE} libkern.o
 
 ${KERNLIB_PROF}:	.NOTMAIN __always_make_kernlib
 	@echo making sure the profiled kern library is up to date...
-	@(cd ${KERNDST} && ${MAKE} -f ${KERNREL}${KERNDIR}/Makefile \
-	  KERNCC="${CC}" \
-	  KERNCFLAGS="${CFLAGS}" \
-	  KERNREL="${KERNREL}" \
-	  KERNDIR="${KERNDIR}" libkern.po)
+	@${KERNMAKE} libkern.po
 
 clean:: 		.NOTMAIN __always_make_kernlib
 	@echo cleaning the kern library objects
-	@(cd ${KERNDST} && ${MAKE} -f ${KERNREL}${KERNDIR}/Makefile \
-	  KERNCC="${CC}" \
-	  KERNCFLAGS="${CFLAGS}" \
-	  KERNREL="${KERNREL}" \
-	  KERNDIR="${KERNDIR}" clean)
+	@${KERNMAKE} clean
 
 __always_make_kernlib:	.NOTMAIN
-	@([ -d ${KERNDST} ] || mkdir -p ${KERNDST})
+	@mkdir -p ${KERNDST}