Fix the libkern references to hopefully DTRT. See comments regarding

a slight change in how profiled version is selected - may need to adjust
some .mk macros if PROF is foolishly initialized anywhere to a null value.
Submitted by:	jkh

3 files changed, 63 insertions, 21 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 0dc0931..901f2dc 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.28 1994/08/13 03:49:32 wollman Exp $
+#	$Id: Makefile.i386,v 1.29 1994/08/18 22:34:36 wollman Exp $
 #
 # Makefile for FreeBSD
 #
@@ -76,12 +76,26 @@ PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
 
 %LOAD
 
-libkern.a:
-	-@if [ X${PROF} = X ]; \
-	then ln -s $S/libkern/obj/libkern.a libkern.a; \
-	else ln -s $S/libkern/obj/libkern_p.a libkern.a; \
-	fi; \
-	echo ln -s $S/libkern/obj/libkern.a libkern.a
+# This is slightly different from before in that if you define PROF
+# to anything, it will assume profiling.  Don't do "PROF=" to turn
+# profiling off!
+.if exists($S/libkern/obj)
+LIBKERNP=$S/libkern/obj
+.else
+LIBKERNP=$S/libkern
+.fi
+.if defined(PROF)
+LIBKERN=${LIBKERNP}/libkern_p.a
+.else
+LIBKERN=${LIBKERNP}/libkern.a
+.fi
+
+libkern.a: ${LIBKERN}
+	ln -s ${LIBKERN} libkern.a
+	echo ln -s ${LIBKERN} libkern.a
+
+${LIBKERN}:
+	@(cd $S/libkern; make)
 
 clean:
 	rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 0dc0931..901f2dc 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.28 1994/08/13 03:49:32 wollman Exp $
+#	$Id: Makefile.i386,v 1.29 1994/08/18 22:34:36 wollman Exp $
 #
 # Makefile for FreeBSD
 #
@@ -76,12 +76,26 @@ PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
 
 %LOAD
 
-libkern.a:
-	-@if [ X${PROF} = X ]; \
-	then ln -s $S/libkern/obj/libkern.a libkern.a; \
-	else ln -s $S/libkern/obj/libkern_p.a libkern.a; \
-	fi; \
-	echo ln -s $S/libkern/obj/libkern.a libkern.a
+# This is slightly different from before in that if you define PROF
+# to anything, it will assume profiling.  Don't do "PROF=" to turn
+# profiling off!
+.if exists($S/libkern/obj)
+LIBKERNP=$S/libkern/obj
+.else
+LIBKERNP=$S/libkern
+.fi
+.if defined(PROF)
+LIBKERN=${LIBKERNP}/libkern_p.a
+.else
+LIBKERN=${LIBKERNP}/libkern.a
+.fi
+
+libkern.a: ${LIBKERN}
+	ln -s ${LIBKERN} libkern.a
+	echo ln -s ${LIBKERN} libkern.a
+
+${LIBKERN}:
+	@(cd $S/libkern; make)
 
 clean:
 	rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 0dc0931..901f2dc 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.28 1994/08/13 03:49:32 wollman Exp $
+#	$Id: Makefile.i386,v 1.29 1994/08/18 22:34:36 wollman Exp $
 #
 # Makefile for FreeBSD
 #
@@ -76,12 +76,26 @@ PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
 
 %LOAD
 
-libkern.a:
-	-@if [ X${PROF} = X ]; \
-	then ln -s $S/libkern/obj/libkern.a libkern.a; \
-	else ln -s $S/libkern/obj/libkern_p.a libkern.a; \
-	fi; \
-	echo ln -s $S/libkern/obj/libkern.a libkern.a
+# This is slightly different from before in that if you define PROF
+# to anything, it will assume profiling.  Don't do "PROF=" to turn
+# profiling off!
+.if exists($S/libkern/obj)
+LIBKERNP=$S/libkern/obj
+.else
+LIBKERNP=$S/libkern
+.fi
+.if defined(PROF)
+LIBKERN=${LIBKERNP}/libkern_p.a
+.else
+LIBKERN=${LIBKERNP}/libkern.a
+.fi
+
+libkern.a: ${LIBKERN}
+	ln -s ${LIBKERN} libkern.a
+	echo ln -s ${LIBKERN} libkern.a
+
+${LIBKERN}:
+	@(cd $S/libkern; make)
 
 clean:
 	rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \