diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-29 15:56:27 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-29 15:56:27 +0000 |
| commit | 5f87b1a8c6a70d1837331ad3e16868ca0f479761 (patch) | |
| tree | c015cce7a85541dfa66f468e6f86978eb2091493 /distrib/luna88k/ramdisk | |
| parent | e024a8a5b234b90892405983af54e8be2a77d43b (diff) | |
TOPDIR and TOP are not neccessary.
Diffstat (limited to 'distrib/luna88k/ramdisk')
| -rw-r--r-- | distrib/luna88k/ramdisk/Makefile | 10 | ||||
| -rw-r--r-- | distrib/luna88k/ramdisk/Makefile.inc | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index b1b0277b3fb..1afcce07c16 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.23 2019/04/29 01:48:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.24 2019/04/29 15:56:26 deraadt Exp $ -TOP= ${.CURDIR}/.. +LDSTATIC=-static +# Hack needed to find kernel images... +BSDSRCDIR?=/usr/src +SRCSYSDIR?=${BSDSRCDIR}/sys -.include "${TOP}/Makefile.inc" IMAGE= mr.fs LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -21,7 +23,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc index 53e1cd825a4..f717b57e14b 100644 --- a/distrib/luna88k/ramdisk/Makefile.inc +++ b/distrib/luna88k/ramdisk/Makefile.inc @@ -1,14 +1,10 @@ -# -# $OpenBSD: Makefile.inc,v 1.9 2019/04/29 01:48:40 deraadt Exp $ -# - -# TOP is assumed to be defined by Makefile including this one. +# $OpenBSD: Makefile.inc,v 1.10 2019/04/29 15:56:26 deraadt Exp $ LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot -COMMONDIR= ${TOP}/ramdisk -MOUNT_POINT?= ${TOP}/${BASE}/fs +COMMONDIR= ${.CURDIR}/../ramdisk +MOUNT_POINT?= ${.CURDIR}/../${BASE}/fs CRUNCHCONF?= ${COMMONDIR}/instbin.conf MTREE= ${UTILS}/mtree.conf @@ -27,7 +23,7 @@ instbin: instbin.mk instbin.cache instbin.c do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ OSrev=${OSrev} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/instbin |