diff options
| author | jperkin <jperkin> | 2014-05-06 14:48:06 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-05-06 14:48:06 +0000 |
| commit | f223c3c5721c6dbb88bc0bb309b1eb995795928d (patch) | |
| tree | bff605a9777c142dc0ee90dfedf2e8f618a1c845 /mk | |
| parent | 1d8901d6e72f7537cf5103d5ab075d2b4610817e (diff) | |
| download | pkgsrc-f223c3c5721c6dbb88bc0bb309b1eb995795928d.tar.gz | |
Move INIT_SYSTEM to bsd.prefs.mk, allowing it to be tested in
package Makefiles when packages perform custom rc.d handling.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6680f96dee6..d070044e96f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1998 2014/04/15 18:55:18 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1999 2014/05/06 14:48:06 jperkin Exp $ # # This file is in the public domain. # @@ -315,14 +315,6 @@ OVERRIDE_DIRDEPTH?= 2 # .include "alternatives.mk" -# Support alternative init systems. -# -INIT_SYSTEM?= rc.d -.if ${INIT_SYSTEM} == "smf" -. include "smf.mk" -.endif -_BUILD_DEFS+= INIT_SYSTEM - # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree # of dependencies for building, and the current target. _PKGSRC_IN?= ===${SMART_MESSAGES:D> ${.TARGET} [${PKGNAME}${_PKGSRC_DEPS}] ===} diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index fb01eddc46b..caa89395490 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.346 2014/05/05 21:26:31 ryoon Exp $ +# $NetBSD: bsd.prefs.mk,v 1.347 2014/05/06 14:48:06 jperkin Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -759,6 +759,14 @@ PREPEND_PATH+= ${X11BASE}/bin .endif PREPEND_PATH+= ${LOCALBASE}/bin +# Support alternative init systems. +# +INIT_SYSTEM?= rc.d +.if ${INIT_SYSTEM} == "smf" +. include "smf.mk" +.endif +_BUILD_DEFS+= INIT_SYSTEM + # Wrapper framework definitions .include "wrapper/wrapper-defs.mk" |