[src/trunk]: src/distrib/amd64 Restore Makefile.installimage include after va...

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

details:   https://anonhg.NetBSD.org/src/rev/3b7d347598e9
branches:  trunk
changeset: 366354:3b7d347598e9
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun May 22 19:32:41 2022 +0000

description:
Restore Makefile.installimage include after variables are set. Makes amd64
USB install images bootable again.

diffstat:

 distrib/amd64/installimage-bios/Makefile   |  4 +++-
 distrib/amd64/installimage/Makefile        |  4 +++-
 distrib/amd64/installimage/installimage.mk |  4 +---
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 4f80307f5689 -r 3b7d347598e9 distrib/amd64/installimage-bios/Makefile
--- a/distrib/amd64/installimage-bios/Makefile  Sun May 22 18:41:22 2022 +0000
+++ b/distrib/amd64/installimage-bios/Makefile  Sun May 22 19:32:41 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2022/05/08 08:12:45 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2022/05/22 19:32:41 jmcneill Exp $
 
 .include <bsd.own.mk>
 
@@ -7,3 +7,5 @@
 .include "../installimage/installimage.mk"
 
 USE_MBR=               yes
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
diff -r 4f80307f5689 -r 3b7d347598e9 distrib/amd64/installimage/Makefile
--- a/distrib/amd64/installimage/Makefile       Sun May 22 18:41:22 2022 +0000
+++ b/distrib/amd64/installimage/Makefile       Sun May 22 19:32:41 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2022/05/08 08:12:45 mrg Exp $
+#      $NetBSD: Makefile,v 1.23 2022/05/22 19:32:41 jmcneill Exp $
 
 .include <bsd.own.mk>
 
@@ -14,3 +14,5 @@
 USE_MBR=               yes
 USE_GPT=               yes
 USE_GPTMBR=            yes
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
diff -r 4f80307f5689 -r 3b7d347598e9 distrib/amd64/installimage/installimage.mk
--- a/distrib/amd64/installimage/installimage.mk        Sun May 22 18:41:22 2022 +0000
+++ b/distrib/amd64/installimage/installimage.mk        Sun May 22 19:32:41 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: installimage.mk,v 1.1 2022/05/08 08:12:45 mrg Exp $
+#      $NetBSD: installimage.mk,v 1.2 2022/05/22 19:32:41 jmcneill Exp $
 
 # common code between distrib/amd64/installimage/Makefile and
 # distrib/amd64/installimage-bios/Makefile.
@@ -29,5 +29,3 @@
        ${.CURDIR}/etc.rc               etc/rc                          \
        ${.CURDIR}/install.sh           .                               \
        ${.OBJDIR}/boot.cfg             .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"