diff options
| author | jlam <jlam@pkgsrc.org> | 2003-01-15 10:06:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-01-15 10:06:48 +0000 |
| commit | bae57c8408f943fe59d332e59d1b5c361aa81ab7 (patch) | |
| tree | 3b693b330ebcb9ab3095e66cff17b4933cf480e9 /mk | |
| parent | b9a549173827fc9c1aacab5293ec1d26990282af (diff) | |
| download | pkgsrc-bae57c8408f943fe59d332e59d1b5c361aa81ab7.tar.gz | |
Revert previous change. Defining BSD_PREFS_MK instead of BSD_PKG_MK
breaks too many users' /etc/mk.conf files that have a
.ifdef BSD_PKG_MK
# /usr/pkgsrc stuff
.else
# /usr/src stuff
.endif
structure. We'll think of another way to protect against multiple
inclusion of bsd.pkg.mk and bsd.prefs.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index e361e4a5c33..f288a6b6ff3 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.103 2003/01/14 16:25:41 wiz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.104 2003/01/15 10:06:48 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -7,10 +7,10 @@ # the system defaults (sys.mk and bsd.own.mk) are used. # Do not recursively include mk.conf, redefine OPSYS, include bsd.own.mk, etc. -.ifndef BSD_PREFS_MK +.ifndef BSD_PKG_MK # Let mk.conf know that this is pkgsrc. -BSD_PREFS_MK=1 +BSD_PKG_MK=1 __PREFIX_SET__:=${PREFIX} .if exists(/usr/bin/uname) @@ -317,4 +317,4 @@ WRKDIR_BASENAME?= work WRKDIR?= ${BUILD_DIR}/${WRKDIR_BASENAME} -.endif # BSD_PREFS_MK +.endif # BSD_PKG_MK |