diff options
| author | jperkin <jperkin> | 2014-08-14 11:08:37 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-08-14 11:08:37 +0000 |
| commit | 10dd6c47df6a15c33f57880d2da88459472cca92 (patch) | |
| tree | f23e5d416d66ce5bfa2479e555297d1b1238d838 | |
| parent | 7885065db7feda4564c19f3ac4226efdac7946b6 (diff) | |
| download | pkgsrc-10dd6c47df6a15c33f57880d2da88459472cca92.tar.gz | |
Split SMF handling across bsd.pkg.mk and bsd.prefs.mk. Should fix issues
with packages which include bsd.prefs.mk before setting SMF variables.
| -rw-r--r-- | mk/bsd.pkg.mk | 8 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ee15aba97a6..0a4e70a28bf 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2000 2014/06/02 10:24:05 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2001 2014/08/14 11:08:37 jperkin Exp $ # # This file is in the public domain. # @@ -315,6 +315,12 @@ OVERRIDE_DIRDEPTH?= 2 # .include "alternatives.mk" +# Handle alternative init systems +# +.if ${INIT_SYSTEM} == "smf" +. include "smf.mk" +.endif + # 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 caa89395490..ad9d4e5f16e 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.347 2014/05/06 14:48:06 jperkin Exp $ +# $NetBSD: bsd.prefs.mk,v 1.348 2014/08/14 11:08:37 jperkin Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -762,9 +762,6 @@ 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 |