diff options
| author | agc <agc> | 1998-01-15 09:37:27 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-01-15 09:37:27 +0000 |
| commit | 7833ca4efc3ca3da65f5b9f92e3dcb2562002698 (patch) | |
| tree | 2fc2db721e5552c01ae6f436ec11b6e7ae1e8071 /mk | |
| parent | cad5d4498988e7e1445c293924fbbc7966b4460c (diff) | |
| download | pkgsrc-7833ca4efc3ca3da65f5b9f92e3dcb2562002698.tar.gz | |
Move the inclusion of bsd.own.mk back to the correct place in
bsd.port.mk, but this time use a definition before the inclusion,
which stops <bsd.own.mk> defining its own install target when
using the package system.
This makes the package system take notice of the definitions in
/etc/mk.conf
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 18 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 18 |
2 files changed, 14 insertions, 22 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index fae484a07cf..9aa7b3cab2b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.28 1997/12/29 20:10:24 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.29 1998/01/15 09:37:27 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -529,6 +529,12 @@ MTREE_ARGS?= -U -f ${MTREE_FILE} -d -e -p .if (${OPSYS} == "OpenBSD") .include <bsd.own.mk> MAKE_ENV+= EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>" +.elif (${OPSYS} == "NetBSD") +NEED_OWN_INSTALL_TARGET= no +.include <bsd.own.mk> +SHAREOWN = ${DOCOWN} +SHAREGRP = ${DOCGRP} +SHAREMODE = ${DOCMODE} .endif # A few aliases for *-install targets @@ -1890,13 +1896,3 @@ ${PLIST}: ${PLIST_SRC} .endif # __ARCH_OK - -.if (${OPSYS} == "NetBSD") -.include <bsd.own.mk> - -SHAREOWN = ${DOCOWN} -SHAREGRP = ${DOCGRP} -SHAREMODE = ${DOCMODE} - -.endif - diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index cd9e83e1aa8..0e38581b0c2 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.28 1997/12/29 20:10:24 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.29 1998/01/15 09:37:27 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -529,6 +529,12 @@ MTREE_ARGS?= -U -f ${MTREE_FILE} -d -e -p .if (${OPSYS} == "OpenBSD") .include <bsd.own.mk> MAKE_ENV+= EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>" +.elif (${OPSYS} == "NetBSD") +NEED_OWN_INSTALL_TARGET= no +.include <bsd.own.mk> +SHAREOWN = ${DOCOWN} +SHAREGRP = ${DOCGRP} +SHAREMODE = ${DOCMODE} .endif # A few aliases for *-install targets @@ -1890,13 +1896,3 @@ ${PLIST}: ${PLIST_SRC} .endif # __ARCH_OK - -.if (${OPSYS} == "NetBSD") -.include <bsd.own.mk> - -SHAREOWN = ${DOCOWN} -SHAREGRP = ${DOCGRP} -SHAREMODE = ${DOCMODE} - -.endif - |