From a727e4697d5cabe4eae9a262ecaf7f5ec6bef897 Mon Sep 17 00:00:00 2001 From: riz Date: Fri, 17 Aug 2012 16:59:26 +0000 Subject: [PATCH] Install live images and install images into ${RELEASEDIR}/images by default, to keep all the large files (such as ISOs) together. --- etc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 561fd3505dab..0c3bc19aab16 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.397 2012/07/14 04:01:11 christos Exp $ +# $NetBSD: Makefile,v 1.398 2012/08/17 16:59:26 riz Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -481,7 +481,7 @@ iso-image-md-post: .PHONY check_DESTDIR check_RELEASEDIR iso-image-mi # LIVEIMG_RELEASEDIR specifies where to install live images and # it can be set in MD etc.${MACHINE}/Makefile.inc. # -LIVEIMG_RELEASEDIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/liveimage +LIVEIMG_RELEASEDIR?= ${RELEASEDIR}/images live-image: .PHONY check_DESTDIR check_RELEASEDIR ${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib live_image \ @@ -495,7 +495,7 @@ live-image: .PHONY check_DESTDIR check_RELEASEDIR # INSTIMG_RELEASEDIR specifies where to install live images and # it can be set in MD etc.${MACHINE}/Makefile.inc. # -INSTIMG_RELEASEDIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/installimage +INSTIMG_RELEASEDIR?= ${RELEASEDIR}/images install-image: .PHONY check_DESTDIR check_RELEASEDIR ${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib install_image \