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/i386 | |
| parent | e024a8a5b234b90892405983af54e8be2a77d43b (diff) | |
TOPDIR and TOP are not neccessary.
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/cdfs/Makefile | 6 | ||||
| -rw-r--r-- | distrib/i386/common/Makefile.inc | 7 | ||||
| -rw-r--r-- | distrib/i386/iso/Makefile | 6 |
3 files changed, 4 insertions, 15 deletions
diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile index fddfa78003b..0b67607c5af 100644 --- a/distrib/i386/cdfs/Makefile +++ b/distrib/i386/cdfs/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.12 2019/04/29 15:56:25 deraadt Exp $ CDROM= cd${OSrev}.iso diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index d854eee0b47..1db3ed2d51d 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.50 2019/04/29 01:48:40 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.51 2019/04/29 15:56:25 deraadt Exp $ -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" IMAGE= mr.fs CRUNCHCONF?= instbin.conf LISTS?= ${.CURDIR}/../common/list @@ -66,7 +63,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/i386/iso/Makefile b/distrib/i386/iso/Makefile index 1d35802e861..88927786765 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2019/04/29 01:48:40 deraadt Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" +# $OpenBSD: Makefile,v 1.21 2019/04/29 15:56:25 deraadt Exp $ CDROM= install${OSrev}.iso |