Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
agc 1998-01-15 09:37:25 +00:00
parent 2cfef7a0ec
commit 5e87acd0dd
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.57 1997/11/03 22:53:25 cgd Exp $ # $NetBSD: bsd.own.mk,v 1.58 1998/01/15 09:37:25 agc Exp $
.if defined(MAKECONF) && exists(${MAKECONF}) .if defined(MAKECONF) && exists(${MAKECONF})
.include "${MAKECONF}" .include "${MAKECONF}"
@ -88,6 +88,11 @@ TARGETS+= all clean cleandir depend includes install lint obj regress \
tags beforedepend afterdepend beforeinstall afterinstall \ tags beforedepend afterdepend beforeinstall afterinstall \
realinstall realinstall
# set NEED_install_TARGET, if it's not already set, to yes
# this is used by bsd.port.mk to stop "install" being defined
NEED_OWN_INSTALL_TARGET?= yes
.if (${NEED_OWN_INSTALL_TARGET} == "yes")
.if !target(install) .if !target(install)
install: .NOTMAIN beforeinstall subdir-install realinstall afterinstall install: .NOTMAIN beforeinstall subdir-install realinstall afterinstall
beforeinstall: .NOTMAIN beforeinstall: .NOTMAIN
@ -95,3 +100,4 @@ subdir-install: .NOTMAIN beforeinstall
realinstall: .NOTMAIN beforeinstall realinstall: .NOTMAIN beforeinstall
afterinstall: .NOTMAIN subdir-install realinstall afterinstall: .NOTMAIN subdir-install realinstall
.endif .endif
.endif

18
share/mk/bsd.port.mk
View File

@ -1,7 +1,7 @@
#-*- mode: Fundamental; tab-width: 4; -*- #-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=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. # bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain. # This file is in the public domain.
@ -529,6 +529,12 @@ MTREE_ARGS?= -U -f ${MTREE_FILE} -d -e -p
.if (${OPSYS} == "OpenBSD") .if (${OPSYS} == "OpenBSD")
.include <bsd.own.mk> .include <bsd.own.mk>
MAKE_ENV+= EXTRA_SYS_MK_INCLUDES="<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 .endif
# A few aliases for *-install targets # A few aliases for *-install targets
@ -1890,13 +1896,3 @@ ${PLIST}: ${PLIST_SRC}
.endif # __ARCH_OK .endif # __ARCH_OK
.if (${OPSYS} == "NetBSD")
.include <bsd.own.mk>
SHAREOWN = ${DOCOWN}
SHAREGRP = ${DOCGRP}
SHAREMODE = ${DOCMODE}
.endif