diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/Makefile | 5 | ||||
| -rw-r--r-- | share/mk/bsd.README | 3 | ||||
| -rw-r--r-- | share/mk/bsd.port.arch.mk | 5 | ||||
| -rw-r--r-- | share/mk/bsd.port.mk | 6 | ||||
| -rw-r--r-- | share/mk/bsd.port.subdir.mk | 6 |
5 files changed, 16 insertions, 9 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile index feb9fc57288..03aceac8934 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2011/03/12 05:12:14 deraadt Exp $ +# $OpenBSD: Makefile,v 1.12 2011/09/24 07:26:01 espie Exp $ # $NetBSD: Makefile,v 1.12 1995/10/22 00:45:53 christos Exp $ FILES= bsd.README bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \ - bsd.obj.mk bsd.own.mk bsd.port.mk bsd.port.subdir.mk bsd.prog.mk \ + bsd.obj.mk bsd.own.mk bsd.port.arch.mk bsd.port.mk \ + bsd.port.subdir.mk bsd.prog.mk \ bsd.regress.mk bsd.subdir.mk bsd.sys.mk sys.mk bsd.lkm.mk \ bsd.xconf.mk bsd.xorg.mk NOOBJ= noobj diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 9f10b0e782c..121bf5a4499 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.README,v 1.45 2011/06/23 22:46:12 schwarze Exp $ +# $OpenBSD: bsd.README,v 1.46 2011/09/24 07:26:01 espie Exp $ # $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $ # @(#)bsd.README 5.1 (Berkeley) 5/11/90 @@ -14,6 +14,7 @@ bsd.nls.mk - National Language Support bsd.obj.mk - creating 'obj' directories and cleaning up bsd.own.mk - define common variables bsd.port.mk - building ports +bsd.port.arch.mk - glue for building ports with MD stuff bsd.port.subdir.mk - targets for building subdirectories for ports bsd.prog.mk - building programs from source files bsd.regress.mk - regression tests diff --git a/share/mk/bsd.port.arch.mk b/share/mk/bsd.port.arch.mk new file mode 100644 index 00000000000..b7017004575 --- /dev/null +++ b/share/mk/bsd.port.arch.mk @@ -0,0 +1,5 @@ +.if !defined(BSD_OWN_MK) +. include <bsd.own.mk> +.endif +PORTSDIR?= /usr/ports +.include "${PORTSDIR}/infrastructure/mk/bsd.port.arch.mk" diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 224d4e07854..14038c8fa37 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -1,5 +1,5 @@ -.include <bsd.own.mk> +.if !defined(BSD_OWN_MK) +. include <bsd.own.mk> +.endif PORTSDIR?= /usr/ports .include "${PORTSDIR}/infrastructure/mk/bsd.port.mk" - -# if you can't find this file, cvs update your ports tree as well. diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk index 28c93766847..742cf598da9 100644 --- a/share/mk/bsd.port.subdir.mk +++ b/share/mk/bsd.port.subdir.mk @@ -1,5 +1,5 @@ -.include <bsd.own.mk> +.if !defined(BSD_OWN_MK) +. include <bsd.own.mk> +.endif PORTSDIR?= /usr/ports .include "${PORTSDIR}/infrastructure/mk/bsd.port.subdir.mk" - -# if you can't find this file, cvs update your ports tree as well. |