From 1ef96a6714207078ce811c55ff52998d4574b7e3 Mon Sep 17 00:00:00 2001
From: chs <chs@NetBSD.org>
Date: Sun, 1 May 2005 18:41:18 +0000
Subject: [PATCH] fix .BEGIN lossage.

---
 sys/arch/hp700/stand/Makefile.buildboot | 22 +++++++++++++---------
 sys/arch/hp700/stand/Makefile.inc       | 19 +------------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/sys/arch/hp700/stand/Makefile.buildboot b/sys/arch/hp700/stand/Makefile.buildboot
index df69442270e3..5531b2fa7972 100644
--- a/sys/arch/hp700/stand/Makefile.buildboot
+++ b/sys/arch/hp700/stand/Makefile.buildboot
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile.buildboot,v 1.6 2004/06/28 16:27:15 jkunz Exp $
+#	$NetBSD: Makefile.buildboot,v 1.7 2005/05/01 18:41:18 chs Exp $
 
-MACHINE_ARCH=hppa
-MACHINE=hp700
 RELOC=	120000
 HEAP_LIMIT=0x1c0000
 #DEBUGFLAGS=-DDEBUG
@@ -26,19 +24,18 @@ NOMAN=
 STRIPFLAG=
 BINMODE=	444
 
-CLEANFILES+=	${PROGAOUT} vers.c vers.o
-
-CPPFLAGS+=	-nostdinc -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..  -I${.OBJDIR}
+CPPFLAGS+=	-nostdinc -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. \
+		-I${.OBJDIR}
 CFLAGS+=	-Os -msoft-float -Wno-main
-CFLAGS+=	-fno-builtin 
+CFLAGS+=	-fno-builtin
 CFLAGS+=	-mdisable-fpregs -mfast-indirect-calls -mpa-risc-1-0
 
 SRCS+=		vers.c
 CLEANFILES+=	vers.c
 
-.PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version hp700 ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version \
+		hp700 ${NEWVERSWHAT}
 
 CPPFLAGS+=		-D_STANDALONE -Dhp700 ${DEBUGFLAGS}
 CPPFLAGS+=		-DRELOC=0x${RELOC} -DHEAP_LIMIT=${HEAP_LIMIT} 
@@ -74,3 +71,10 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	@echo ${PROG} total size should not exceed XXXX bytes
 
 .include <bsd.prog.mk>
+
+.BEGIN:
+	@([ -h machine ] || ln -s $S/arch/hp700/include machine)
+	@([ -h hppa ] || ln -s $S/arch/hppa/include hppa)
+
+.NOPATH: machine hppa
+CLEANFILES+=machine hppa
diff --git a/sys/arch/hp700/stand/Makefile.inc b/sys/arch/hp700/stand/Makefile.inc
index 47798a23d995..239c444fb295 100644
--- a/sys/arch/hp700/stand/Makefile.inc
+++ b/sys/arch/hp700/stand/Makefile.inc
@@ -1,21 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.3 2004/07/28 09:17:31 skrll Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2005/05/01 18:41:18 chs Exp $
 
 BINDIR=			/usr/mdec
 
-release:
-
-S?=		${.CURDIR}/../../../..
-
-.BEGIN: machine hp700 hppa
-.NOPATH: machine hp700 hppa
-realall realdepend: machine hp700 hppa
-
-machine hp700 :
-	-rm -f $@
-	ln -s ${S}/arch/hp700/include $@
-
-hppa :
-	-rm -f $@
-	ln -s ${S}/arch/hppa/include $@
-
-CLEANFILES+=machine hp700 hppa