diff options
Diffstat (limited to 'distrib/landisk')
| -rw-r--r-- | distrib/landisk/miniroot/Makefile | 4 | ||||
| -rw-r--r-- | distrib/landisk/ramdisk/Makefile | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile index 4b7a0639c69..40687af1d89 100644 --- a/distrib/landisk/miniroot/Makefile +++ b/distrib/landisk/miniroot/Makefile @@ -58,8 +58,10 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${IMAGE} ${DESTDIR}/snapshot/ + cp ${IMAGE} ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index da3d98ba550..4509e55e873 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2009/03/28 16:34:24 krw Exp $ +# $OpenBSD: Makefile,v 1.12 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -72,8 +72,10 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${BSD_RD} ${DESTDIR}/snapshot/ + cp ${BSD_RD} ${RELEASEDIR} +.endif ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -88,7 +90,7 @@ do_files: cat ${MTREE} | mtree -de -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/../miniroot/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: @@ -97,8 +99,5 @@ clean cleandir: rm -f instbin.conf rm -rf cd-dir -beforeinstall: - cp ${BSD.RD} ${DESTDIR}/snapshot - .include <bsd.obj.mk> .include <bsd.subdir.mk> |