--- Net2/arch/hp300/conf/makefile.hp300	2018/04/24 18:04:00	1.1
+++ Net2/arch/hp300/conf/makefile.hp300	2018/04/24 18:18:18	1.1.1.2
@@ -29,10 +29,10 @@ TOUCH=	touch -f -c
 GPROF.EX=/usr/src/usr.lib/libc/csu/hp300/gmon.ex
 
 # source tree is located via $S relative to the compilation directory
-S=	../..
-HP300=	$S/hp300
+S=	../../../..
+HP300=	../..
 
-INCLUDES= -I. -I$S -I$S/sys
+INCLUDES= -I. -I$S/arch -I$S -I$S/sys
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Dmc68020 -Dhp300 -DFPCOPROC -DREFBIT
 CFLAGS=	-O ${COPTS}
 
@@ -68,7 +68,7 @@ SYSTEM_OBJ=	locore.o ${OBJS} param.o ioc
 #SYSTEM_DEP=	Makefile symbols.sort ${SYSTEM_OBJ}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@echo loading $@; rm -f $@
-SYSTEM_LD=	@strip=-x; [ X${DEBUG} = X-g ] && strip=-X; \
+SYSTEM_LD=	@strip=-x; [ X${DEBUG} = X-g ] && strip=-X || true; \
 		${LD} $$strip -n -o $@ -e start ${SYSTEM_OBJ} vers.o
 #SYSTEM_LD_TAIL= @echo rearranging symbols;\
 #		symorder symbols.sort $@;\
@@ -79,9 +79,9 @@ SYSTEM_LD_TAIL=	@size $@; chmod 755 $@;
 
 %LOAD
 
-newvers:
-	sh $S/conf/newvers.sh
-	${CC} $(CFLAGS) -c vers.c
+vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
+	${CC} ${CFLAGS} -c vers.c
 
 clean:
 	rm -f eddep *vmunix tags *.o locore.i [a-z]*.s \
@@ -120,7 +120,7 @@ assym.s: genassym
 	./genassym >assym.s
 
 genassym:
-	${CC} ${INCLUDES} ${IDENT} ${PARAM} -Dmc68020 -Dhp300 -o genassym \
+	${CC} ${INCLUDES} ${IDENT} -DKERNEL ${PARAM} -Dmc68020 -Dhp300 -o genassym \
 	    ${HP300}/hp300/genassym.c
 
 depend: assym.s param.c