diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2019-04-29 17:55:55 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2019-04-29 17:55:55 +0000 |
| commit | ad84724f55757326b60c97b8aaf248ba99382d8a (patch) | |
| tree | cfb2e441dd55e719d14a9cd722961b8d36a5d898 | |
| parent | a46e2d4060ef0f1a29f0d2222ef7ca8e98f3d898 (diff) | |
$() is expanded by make itself, so consistently use `cat vnd`; ok deraadt@
| -rw-r--r-- | distrib/ramdisk/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 6cd851d5f61..59aab6ab993 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.60 2019/04/29 01:48:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.61 2019/04/29 17:55:54 naddy Exp $ ARCHDIR= ${.CURDIR}/../${MACHINE}/ramdisk @@ -47,11 +47,11 @@ all: bsd.rd ${FLOPPY}: bsd.gz ${BOOT} ${BOOTXX} dd if=/dev/zero of=${FLOPPY} count=${FLOPPYSIZE} vnconfig -v ${FLOPPY} > vnd - disklabel -w $(cat vnd) ${FLOPPYTYPE} - newfs ${NEWFSOPTS_FD} /dev/r$(cat vnd)a - mount /dev/$(cat vnd)a ${MOUNT_POINT} + disklabel -w `cat vnd` ${FLOPPYTYPE} + newfs ${NEWFSOPTS_FD} /dev/r`cat vnd`a + mount /dev/`cat vnd`a ${MOUNT_POINT} cp bsd.gz ${MOUNT_POINT}/bsd - ${INSTALLBOOT} -v -r ${MOUNT_POINT} $(cat vnd) ${BOOTXX} ${BOOT} + ${INSTALLBOOT} -v -r ${MOUNT_POINT} `cat vnd` ${BOOTXX} ${BOOT} df -i ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u `cat vnd` @@ -73,9 +73,9 @@ bsd.gz: bsd.rd ${IMAGE}: instbin dd if=/dev/zero of=${IMAGE} count=${IMAGESIZE} vnconfig -v ${IMAGE} > vnd - disklabel -w $(cat vnd) ${DISKTYPE} - newfs ${NEWFSOPTS_RD} /dev/r$(cat vnd)a - mount /dev/$(cat vnd)a ${MOUNT_POINT} + disklabel -w `cat vnd` ${DISKTYPE} + newfs ${NEWFSOPTS_RD} /dev/r`cat vnd`a + mount /dev/`cat vnd`a ${MOUNT_POINT} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u OSrev=${OSrev} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ |