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/sgi | |
| parent | e024a8a5b234b90892405983af54e8be2a77d43b (diff) | |
TOPDIR and TOP are not neccessary.
Diffstat (limited to 'distrib/sgi')
| -rw-r--r-- | distrib/sgi/cdfs/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sgi/iso/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sgi/ramdisk/Makefile | 10 |
3 files changed, 6 insertions, 16 deletions
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index d20afff6b97..be597a32ad7 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.21 2019/04/29 15:56:26 deraadt Exp $ CDROM= cd${OSrev}.iso FFS= ffs.img diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile index eea445eb0b8..619ccf30d24 100644 --- a/distrib/sgi/iso/Makefile +++ b/distrib/sgi/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.33 2019/04/29 15:56:26 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 4522b2ad6d1..b66ea66882e 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2019/04/29 01:48:41 deraadt Exp $ - -TOP= ${.CURDIR}/.. +# $OpenBSD: Makefile,v 1.28 2019/04/29 15:56:26 deraadt Exp $ IMAGE= mr.fs CRUNCHCONF?= instbin.conf @@ -31,10 +29,10 @@ all: ${ALLBSDRD} .for IP in ${ALLIP} bsd.IP${IP}: .ifndef NOBUILD - cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP} && \ + cd ${.CURDIR}/../../../sys/arch/sgi/compile/RAMDISK-IP${IP} && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' .endif - cp -p ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP}/obj/bsd bsd.IP${IP} + cp -p ${.CURDIR}/../../../sys/arch/sgi/compile/RAMDISK-IP${IP}/obj/bsd bsd.IP${IP} bsd.rd.IP${IP}: ${IMAGE} bsd.IP${IP} cp bsd.IP${IP} bsd.rd.IP${IP} @@ -45,7 +43,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 |