Invoke genassym.sh with both m68k/m68k/genassym.cf and

machine/machine/genassym.cf files (poor man's inclusion).

1 files changed, 9 insertions, 6 deletions

diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index b30637ef7c9..f2e7f128350 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.21 2001/07/15 13:10:47 assar Exp $
+#	$OpenBSD: Makefile.hp300,v 1.22 2001/08/30 22:10:18 miod Exp $
 #	$NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $
 
 # Makefile for OpenBSD
@@ -35,6 +35,7 @@ COPTS?=		-O2
 S!=	cd ../../../..; pwd
 .endif
 HP300=	$S/arch/hp300
+M68K=	$S/arch/m68k
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
@@ -67,7 +68,7 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
 ### for the Motorola 68040 Floating Point Software Product
-.include "$S/arch/m68k/fpsp/Makefile.inc"
+.include "${M68K}/fpsp/Makefile.inc"
 
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
@@ -108,10 +109,12 @@ LINKFLAGS+=	-S
 
 %LOAD
 
-assym.h: $S/kern/genassym.sh ${HP300}/hp300/genassym.cf
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${HP300}/hp300/genassym.cf > assym.h.tmp && \
-	    mv -f assym.h.tmp assym.h
+assym.h: $S/kern/genassym.sh \
+	 ${M68K}/m68k/genassym.cf ${HP300}/hp300/genassym.cf
+	cat ${M68K}/m68k/genassym.cf ${HP300}/hp300/genassym.cf | \
+	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    > assym.h.tmp && \
+	mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
 	rm -f param.c