 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.bootimage,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+#	$NetBSD: Makefile.bootimage,v 1.2 2012/01/22 16:50:00 tsutsui Exp $
+#
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 @@ -113,31 +113,26 @@
+#
 .include <bsd.sys.mk>		# for HOST_SH
 .include <bsd.own.mk> 		#
 .include <bsd.endian.mk>	# for TARGET_ENDIANNESS
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 .if empty(IMGBASE)
 .BEGIN:
 	@echo "Error: IMGBASE is not set"
 	@false
 .endif
 .if empty(RELEASEDIR)
 .BEGIN:
 	@echo "Error: RELEASEDIR is not set"
 	@false
 .endif
 # should be defined elsewhere?
 CAT?=		cat
 CHMOD?=		chmod
 CP?=		cp
 DD?=		dd
 MKDIR?=		mkdir -p
 RM?=		rm
+#
 # common definitions for image
+#
 BOOTDISK?=	sd0

 @@ -1,35 +1,34 @@
-#	$NetBSD: Makefile.installimage,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+#	$NetBSD: Makefile.installimage,v 1.2 2012/01/22 16:50:00 tsutsui Exp $
+#
 # Common Makefile to create a bootable installation image for USB flash etc.
+#
+#
 # Required variables:
 #	INSTIMGBASE
 #		Basename of the liveimage
+#
 # See Makefile.bootimage for other variables.
+#
-.if empty(INSTIMGBASE)
+.if !target(check_INSTIMGBASE)
-.BEGIN:
+check_INSTIMGBASE: .PHONY .NOTMAIN
 .if !defined(INSTIMGBASE)
 	@echo "Error: INSTIMGBASE is not set"
 	@false
 .else
 	@true
 .endif
 .if empty(RELEASEDIR)
 .BEGIN:
 	@echo "Error: RELEASEDIR is not set"
 	@false
 .endif
 SWAPMB=		0			# no swap
 OMIT_SWAPIMG=	yes			# nothing to write
 KERN_SET?=	kern-GENERIC
 SETS?=		modules base etc
 FSTAB_IN?=	${NETBSDSRCDIR}/distrib/common/bootimage/fstab.install.in
 .if ${USE_MBR} != "no"
 DISKPROTO_IN?=	${NETBSDSRCDIR}/distrib/common/bootimage/diskproto.noswap.mbr.in
 .else
 @@ -44,20 +43,20 @@ IMGDIR_EXCLUDE+=	-s ',./installation/ins
 IMGBASE=        ${INSTIMGBASE}
 .include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.bootimage"
 # INSTIMG_RELEASEDIR specifies where to install ${INSTIMGBASE}.img.gz.
 # This should be passed from etc/Makefile or etc/etc.${MACHINE}/Makefile.inc
 # but also set default here for manual builds.
 INSTIMG_RELEASEDIR?=	${RELEASEMACHINEDIR}/installation/installimage
 # should be defined elsewhere?
 MKDIR?=		mkdir -p
-install_image: ${IMGBASE}.img.gz
+install_image: check_INSTIMGBASE check_RELEASEDIR ${IMGBASE}.img.gz
 	${MKDIR} ${INSTIMG_RELEASEDIR}
 	${RELEASE_INSTALL} ${IMGBASE}.img.gz ${INSTIMG_RELEASEDIR}
 	# note ${MAKESUM} will be calculated in src/etc/Makefile
 release:

 @@ -1,43 +1,42 @@
-#	$NetBSD: Makefile.liveimage,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+#	$NetBSD: Makefile.liveimage,v 1.2 2012/01/22 16:50:00 tsutsui Exp $
+#
 # Common Makefile to create a bootable FS image for USB flash or emulators
+#
+#
 # Required variables:
 #	LIVEIMGBASE
 #		Basename of the liveimage
+#
 # See Makefile.bootimage for other variables.
+#
-.if empty(LIVEIMGBASE)
+.if !target(check_LIVEIMGBASE)
-.BEGIN:
+check_LIVEIMGBASE: .PHONY .NOTMAIN
 .if !defined(LIVEIMGBASE)
 	@echo "Error: LIVEIMGBASE is not set"
 	@false
 .else
 	@true
 .endif
 .if empty(RELEASEDIR)
 .BEGIN:
 	@echo "Error: RELEASEDIR is not set"
 	@false
 .endif
 IMGBASE=	${LIVEIMGBASE}
 .include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.bootimage"
 # LIVEIMG_RELEASEDIR specifies where to install ${LIVEIMGBASE}.img.gz.
 # This should be passed from etc/Makefile or etc/etc.${MACHINE}/Makefile.inc
 # but also set default here for manual builds.
 LIVEIMG_RELEASEDIR?=	${RELEASEMACHINEDIR}/installation/liveimage
 # should be defined elsewhere?
 MKDIR?=		mkdir -p
-live_image: ${IMGBASE}.img.gz
+live_image: check_LIVEIMGBASE check_RELEASEDIR ${IMGBASE}.img.gz
 	${MKDIR} ${LIVEIMG_RELEASEDIR}
 	${RELEASE_INSTALL} ${IMGBASE}.img.gz ${LIVEIMG_RELEASEDIR}
 	# note ${MAKESUM} will be calculated in src/etc/Makefile
 release: