diff options
| author | jlam <jlam> | 2004-10-06 20:51:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-10-06 20:51:47 +0000 |
| commit | c7b0e342a174314c7c6b65cb1c479b91c5712f7f (patch) | |
| tree | ffe32abb58592bdfb0f01b3938e405c22c89890d /mk/bsd.prefs.mk | |
| parent | aaf68457062cf119f42ebe2901191926bc98df9e (diff) | |
| download | pkgsrc-c7b0e342a174314c7c6b65cb1c479b91c5712f7f.tar.gz | |
Reorganize some of the files under pkgsrc/mk:
(1) defs.${OPSYS}.mk --> platform/${OPSYS}.mk.
The "platform" subdirectory is where all of the ${OPSYS}-specific
infrastructure logic should reside.
(2) bsd.pkg.defaults.mk --> defaults/mk.conf
bsd.pkg.obsolete.mk --> defaults/obsolete.mk
Renaming bsd.pkg.defaults.mk to defaults/mk.conf is to mimic the way
that NetBSD has /etc/rc.conf as well as /etc/defaults/rc.conf, where
the latter is a full list of user-settable variables, and the two
files share the same name to reinforce the fact /etc/defaults/rc.conf
can be directly copied in place as /etc/rc.conf. This is the same
relationship shared by defaults/mk.conf and /etc/mk.conf.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 46275cd6ec9..5dd150dc60b 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.168 2004/09/27 12:05:53 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.169 2004/10/06 20:51:47 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -222,8 +222,8 @@ PKGSRC_TOPDIR= ${.CURDIR} .endif # include the defaults file -.if exists(${PKGSRC_TOPDIR}/mk/bsd.pkg.defaults.mk) -. include "${PKGSRC_TOPDIR}/mk/bsd.pkg.defaults.mk" +.if exists(${PKGSRC_TOPDIR}/mk/defaults/mk.conf) +. include "${PKGSRC_TOPDIR}/mk/defaults/mk.conf" .endif .if ${OPSYS} == "NetBSD" @@ -257,10 +257,10 @@ SHAREMODE?= ${DOCMODE} # Load the OS-specific definitions for program variables. Default to loading # the NetBSD ones if an OS-specific file doesn't exist. -.if exists(${PKGSRC_TOPDIR}/mk/defs.${OPSYS}.mk) -. include "${PKGSRC_TOPDIR}/mk/defs.${OPSYS}.mk" -.elif exists(${PKGSRC_TOPDIR}/mk/defs.NetBSD.mk) -. include "${PKGSRC_TOPDIR}/mk/defs.NetBSD.mk" +.if exists(${PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk) +. include "${PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk" +.elif exists(${PKGSRC_TOPDIR}/mk/platform/NetBSD.mk) +. include "${PKGSRC_TOPDIR}/mk/platform/NetBSD.mk" .endif PKGDIRMODE?= 755 |