summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorjlam <jlam>2004-10-07 02:01:37 +0000
committerjlam <jlam>2004-10-07 02:01:37 +0000
commita382f811f00cc359fc6c3d7c7386417af7b05fd1 (patch)
tree15912261de9f656cabfa82bfc7708e5e4ee1ae67 /Makefile
parent9828610aa3d1827c2d4d36482a824f63d62fd0b0 (diff)
downloadpkgsrc-a382f811f00cc359fc6c3d7c7386417af7b05fd1.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 'Makefile')
-rw-r--r--Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index f8a8758dc90..99e0ef49c3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2004/08/27 21:32:55 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2004/10/07 02:01:37 jlam Exp $
#
.include "mk/bsd.prefs.mk"
@@ -59,7 +59,7 @@ SUBDIR+= ${USER_ADDITIONAL_PKGS}
PKGSRCTOP= yes
-# If PACKAGES is set to the default (${_PKGSRCDIR}/packages), the current
+# If PACKAGES is set to the default (${PKGSRCDIR}/packages), the current
# ${MACHINE_ARCH} and "release" (uname -r) will be used. Otherwise a directory
# structure of ...pkgsrc/packages/`uname -r`/${MACHINE_ARCH} is assumed.
# The PKG_URL is set from FTP_PKG_URL_* or CDROM_PKG_URL_*, depending on
@@ -99,9 +99,6 @@ README.html: .PRECIOUS
# directory.
.if make(bulk-cache) || make(clean-bulk-cache)
.include "${.CURDIR}/mk/bulk/bsd.bulk-pkg.mk"
-# force the setting of _PKGSRCDIR because the way it gets
-# set in bsd.prefs.mk is broken if you're in this top level directory
-_PKGSRCDIR=${.CURDIR}
.endif
.PHONY: ${.CURDIR}/PKGDB