A horrific gruesome hack to remove a splat during obj@ builds

diff --git a/sys/arch/sparc/stand/Makefile b/sys/arch/sparc/stand/Makefile
index 52bc933..f050772 100644 (file)
--- a/sys/arch/sparc/stand/Makefile
+++ b/sys/arch/sparc/stand/Makefile
@@ -5,6 +5,7 @@ SUBDIR= boot bootxx installboot
 ### find out what to use for libkern and libsa
 SAREL=
 KERNREL=
+TOPLEVEL=1
 .include "Makefile.inc"
 .include "$S/lib/libkern/Makefile.inc"
 .include "$S/lib/libsa/Makefile.inc"

diff --git a/sys/arch/sparc/stand/Makefile.inc b/sys/arch/sparc/stand/Makefile.inc
index 4f2600d..fee77b1 100644 (file)
--- a/sys/arch/sparc/stand/Makefile.inc
+++ b/sys/arch/sparc/stand/Makefile.inc
@@ -5,10 +5,12 @@ __stand_makefile_inc=1
 
 S= ${.CURDIR}/../../../${R}
 
+.ifndef TOPLEVEL
 .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir)
 .BEGIN:
        -@([ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine)
 .endif
+.endif
 
 RELOC_SUN4=    0x240000
 RELOC_SUN4C=   0x340000
@@ -25,6 +27,6 @@ srt0.o: srt0.S
        ${CC} ${CFLAGS} -D_LOCORE -c ${.IMPSRC}
 
 cleandir:
-       rm -rf lib machine
+       -@rm -rf lib machine
 
 .endif