Hopefully replicate the install.debug changes from the i386 version.

2 files changed, 30 insertions, 48 deletions

diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index 123763f..5e20c4e 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.19 1999/04/07 09:27:59 grog Exp $
+#	$Id: Makefile.alpha,v 1.20 1999/04/11 03:40:11 grog Exp $
 #
 # Makefile for FreeBSD
 #
@@ -17,9 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	300010
-
-BINFORMAT?=	elf
+%VERSREQ=	300011
 
 STD8X16FONT?=	iso
 
@@ -75,13 +73,17 @@ SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
-.if ${BINFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
+
+.if defined(DEBUG)
+FULLKERNEL=	${KERNEL}.debug
+.else
+FULLKERNEL=	${KERNEL}
 .endif
 
 %BEFORE_DEPEND
@@ -246,25 +248,13 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 .if defined(DEBUG)
-install:	${KERNEL}
-.if exists(${DESTDIR}/${KERNEL})
-	-chflags noschg ${DESTDIR}/${KERNEL}
-	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
+${KERNEL}:	${FULLKERNEL}
+	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .endif
-	PATH=$${PATH}:/sbin:/usr/sbin; \
-	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
-		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
-		if [ -f /var/db/kvm_kernel.db ] ; then \
-			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
-		fi \
-	fi
-	install -c -m 555 -o root -g wheel -fschg ${KERNEL} ${DESTDIR}/
-
-.endif
-
-${INSTALL}:
-	@if [ ! -f ${KERNEL} ] ; then \
-		echo "You must first build your kernel before trying to install." ; \
+  
+install install.debug:
+	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
+		echo "You must first build a kernel first." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/${KERNEL})
@@ -278,7 +268,8 @@ ${INSTALL}:
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
-	install -c -m 555 -o root -g wheel -fschg ${FULLKERNEL} ${DESTDIR}/${KERNEL}
+	install -c -m 555 -o root -g wheel -fschg \
+		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
 
 ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h
 	${CC} -c ${CFLAGS} ioconf.c
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 123763f..5e20c4e 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.19 1999/04/07 09:27:59 grog Exp $
+#	$Id: Makefile.alpha,v 1.20 1999/04/11 03:40:11 grog Exp $
 #
 # Makefile for FreeBSD
 #
@@ -17,9 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	300010
-
-BINFORMAT?=	elf
+%VERSREQ=	300011
 
 STD8X16FONT?=	iso
 
@@ -75,13 +73,17 @@ SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
-.if ${BINFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
+
+.if defined(DEBUG)
+FULLKERNEL=	${KERNEL}.debug
+.else
+FULLKERNEL=	${KERNEL}
 .endif
 
 %BEFORE_DEPEND
@@ -246,25 +248,13 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 .if defined(DEBUG)
-install:	${KERNEL}
-.if exists(${DESTDIR}/${KERNEL})
-	-chflags noschg ${DESTDIR}/${KERNEL}
-	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
+${KERNEL}:	${FULLKERNEL}
+	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .endif
-	PATH=$${PATH}:/sbin:/usr/sbin; \
-	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
-		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
-		if [ -f /var/db/kvm_kernel.db ] ; then \
-			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
-		fi \
-	fi
-	install -c -m 555 -o root -g wheel -fschg ${KERNEL} ${DESTDIR}/
-
-.endif
-
-${INSTALL}:
-	@if [ ! -f ${KERNEL} ] ; then \
-		echo "You must first build your kernel before trying to install." ; \
+  
+install install.debug:
+	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
+		echo "You must first build a kernel first." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/${KERNEL})
@@ -278,7 +268,8 @@ ${INSTALL}:
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
-	install -c -m 555 -o root -g wheel -fschg ${FULLKERNEL} ${DESTDIR}/${KERNEL}
+	install -c -m 555 -o root -g wheel -fschg \
+		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
 
 ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h
 	${CC} -c ${CFLAGS} ioconf.c