diff options
| author | jlam <jlam@pkgsrc.org> | 2004-10-07 02:01:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-10-07 02:01:37 +0000 |
| commit | 17c3aafac1aa4cacaba3e9998eacf16787dfefb4 (patch) | |
| tree | 15912261de9f656cabfa82bfc7708e5e4ee1ae67 /mk/defaults | |
| parent | d2eb44c14d837a993265620b7872506e7223a34f (diff) | |
| download | pkgsrc-17c3aafac1aa4cacaba3e9998eacf16787dfefb4.tar.gz | |
* Make PKGSRC_TOPDIR a private variable by renaming it to _PKGSRC_TOPDIR,
as it's only used internally by bsd.prefs.mk.
* Make _PKGSRCDIR a public variable by renaming it to PKGSRCDIR.
Also, generate its value from ${_PKGSRC_TOPDIR} so it's less fragile
than the old method of stripping off the last two components of
${.CURDIR}. PKGSRCDIR may now be used after bsd.prefs.mk is defined.
* Change all references to _PKGSRCDIR to PKGSRCDIR.
Diffstat (limited to 'mk/defaults')
| -rw-r--r-- | mk/defaults/mk.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 08d12e13803..d81c3bb9eb7 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.2 2004/10/06 20:59:40 jlam Exp $ +# $NetBSD: mk.conf,v 1.3 2004/10/07 02:01:39 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -218,7 +218,7 @@ BSDXSRCDIR?= /usr/xsrc # Possible: any path # Default: /usr/xsrc -DISTDIR?= ${_PKGSRCDIR}/distfiles +DISTDIR?= ${PKGSRCDIR}/distfiles # Directory where original distribution # files are stored. # Possible: any path you like @@ -284,7 +284,7 @@ RCD_SCRIPTS_DIR?= /etc/rc.d # Possible: any path you like # Default: /etc/rc.d -PACKAGES?= ${_PKGSRCDIR}/packages +PACKAGES?= ${PKGSRCDIR}/packages # Store generated packages on a per-architecture base # Possible: any path you like # Default: /usr/pkgsrc/packages |