[src/trunk]: src/sys/arch/amiga/stand/bootblock make this work again.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ba61642e4539
branches:  trunk
changeset: 822829:ba61642e4539
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 09 14:51:52 2017 +0000

description:
make this work again.

diffstat:

 sys/arch/amiga/stand/bootblock/boot/Makefile       |  12 +++++-----
 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile |  26 ++++++++++++---------
 2 files changed, 21 insertions(+), 17 deletions(-)

diffs (98 lines):

diff -r e33a163e6a33 -r ba61642e4539 sys/arch/amiga/stand/bootblock/boot/Makefile
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile      Sun Apr 09 00:02:30 2017 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile      Sun Apr 09 14:51:52 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.55 2017/04/08 19:53:19 christos Exp $
+#      $NetBSD: Makefile,v 1.56 2017/04/09 14:51:52 christos Exp $
 
 .include <bsd.init.mk>
 .include <bsd.sys.mk>          # for HOST_SH
@@ -11,11 +11,11 @@
 #XX#DIR_LIBZ = ${DIR_TOP}/../common/dist/zlib
 
 DIR_TOP=       ${.CURDIR}/../../../../..
-DIR_SA =       ${S}/lib/libsa
+DIR_SA =       ${DIR_TOP}/lib/libsa
 DIR_LIBZ=
-DIR_KERN=      ${S}/lib/libkern
-DIR_KERN_MD=   ${S}/lib/libkern/arch/$(MACHINE_ARCH)
-DIR_LIBC=      ${S}/../common/lib/libc
+DIR_KERN=      ${DIR_TOP}/lib/libkern
+DIR_KERN_MD=   ${DIR_TOP}/lib/libkern/arch/$(MACHINE_ARCH)
+DIR_LIBC=      ${DIR_TOP}/../common/lib/libc
 
 .PATH:  $(DIR_SA) ${DIR_LIBZ} $(DIR_KERN) $(DIR_KERN_MD) \
        ${DIR_LIBC}/gen ${DIR_LIBC}/arch/m68k/gen \
@@ -70,7 +70,7 @@
 
 CLEANFILES += boot.amiga x.out xxstart.o libboot.a
 
-VERSIONFLAGS+=-N
+VERSIONFLAGS+=-n
 .include "${S}/conf/newvers_stand.mk"
 
 .include <bsd.prog.mk>
diff -r e33a163e6a33 -r ba61642e4539 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Sun Apr 09 00:02:30 2017 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Sun Apr 09 14:51:52 2017 +0000
@@ -1,12 +1,15 @@
-#      $NetBSD: Makefile,v 1.24 2017/04/08 19:53:20 christos Exp $
+#      $NetBSD: Makefile,v 1.25 2017/04/09 14:51:52 christos Exp $
+
+.include <bsd.init.mk>
+.include <bsd.sys.mk>
 
 ### what we need:
 
-S=     ${.CURDIR}/../../../../..
-DIR_SA =       ${S}/lib/libsa
-DIR_KERN=      ${S}/lib/libkern
-DIR_KERN_MD=   ${S}/lib/libkern/arch/$(MACHINE_ARCH)
-DIR_LIBC=      ${S}/../common/lib/libc
+DIR_TOP=       ${.CURDIR}/../../../../..
+DIR_SA =       ${DIR_TOP}/lib/libsa
+DIR_KERN=      ${DIR_TOP}/lib/libkern
+DIR_KERN_MD=   ${DIR_TOP}/lib/libkern/arch/$(MACHINE_ARCH)
+DIR_LIBC=      ${DIR_TOP}/../common/lib/libc
 
 .PATH:  ${.CURDIR}/../boot $(DIR_SA) $(DIR_KERN) $(DIR_KERN_MD) \
        ${DIR_LIBC}/gen ${DIR_LIBC}/arch/m68k/gen \
@@ -14,6 +17,7 @@
        ${DIR_LIBC}/quad ${DIR_LIBC}/arch/m68k/quad \
        ${DIR_LIBC}/string ${DIR_LIBC}/arch/m68k/string
 
+S=             ${DIR_TOP}
 
 # prefer our assembler versions over assembler, and assembler over C:
 
@@ -24,7 +28,7 @@
 BINDIR=/usr/mdec
 
 COBJS = main.o console.o xd.o twiddle.o bzero.o gets.o
-COBJS+=  lseek.o open.o read.o close.o dev.o errno.o
+COBJS+=  lseek.o open.o vers.o read.o close.o dev.o errno.o
 COBJS+=  ufs.o ustarfs.o panic.o files.o
 
 SOBJS = alloc.o ashrdi3.o ashldi3.o bcopy.o muldi3.o printf.o startit.o
@@ -43,6 +47,10 @@
 
 CLEANFILES += bootxx_ffs bootxx_fd x.out f.out xxstart.o fdstart.o libboot.a
 
+VERSIONFILE=${.CURDIR}/../boot/version
+VERSIONFLAGS+=-n
+.include "${S}/conf/newvers_stand.mk"
+
 .include <bsd.prog.mk>
 .include <bsd.klinks.mk>
 
@@ -113,10 +121,6 @@
        ${_MKTARGET_BUILD}
        ${AR} crs $@ $> && ${RANLIB} $@
 
-VERSIONFILE=${.CURDIR}/../boot/version
-VERSIONFLAGS=-n
-.include "${S}/conf/newvers_stand.mk"
-
 # make sure these are built:
 
 ${COBJS}: ${TXLT}