Do not create machine@ symlinks in obj as root during includes:, but

defer their creation to later, so that they are owned by BUILDUSER.
This eliminates the last root-owned files in obj/ from 'make build'.
In addition, place a MACHINE == hppa test in hppa/stand/Makefile.inc
to avoid creating bogus symlinks on all other archs.

joint work with & ok natano, "let's try it" deraadt

2 files changed, 4 insertions, 4 deletions

diff --git a/sys/arch/loongson/stand/boot/Makefile.inc b/sys/arch/loongson/stand/boot/Makefile.inc
index 98bf17e40f0..a25dd082520 100644
--- a/sys/arch/loongson/stand/boot/Makefile.inc
+++ b/sys/arch/loongson/stand/boot/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2014/07/12 23:34:54 jasper Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2016/11/06 16:42:00 tb Exp $
 
 NOMAN=
 S=		${.CURDIR}/../../../..
@@ -29,7 +29,7 @@ SRCS+=		boot.c cmd.c vars.c
 SRCS+=		strlcat.c strlcpy.c strlen.c
 SRCS+=		udivdi3.c qdivrem.c
 
-.if !make(obj)
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
 .BEGIN:
 	@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
 	@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)
diff --git a/sys/arch/loongson/stand/libsa/Makefile b/sys/arch/loongson/stand/libsa/Makefile
index 844b3333cfb..08fa3c27a38 100644
--- a/sys/arch/loongson/stand/libsa/Makefile
+++ b/sys/arch/loongson/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2015/11/16 19:33:52 miod Exp $
+#	$OpenBSD: Makefile,v 1.8 2016/11/06 16:42:00 tb Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -40,7 +40,7 @@ ${OBJS}:	${.CURDIR}/../Makefile.inc
 NOPROFILE=
 NOPIC=
 
-.if !make(obj)
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
 .BEGIN:
 	@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
 	@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)