summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorwulf <wulf>2001-10-26 15:08:43 +0000
committerwulf <wulf>2001-10-26 15:08:43 +0000
commitf529f1d5f6f62d06c8623e14f4992a623f8bee0e (patch)
tree783371d38ff3f16928b31bb11ed1b3354fd1e35f /mk
parent3d1c6105286fee22de6221672ce9268584a62205 (diff)
downloadpkgsrc-f529f1d5f6f62d06c8623e14f4992a623f8bee0e.tar.gz
Changed PKGDIR assignment to allow migration of files currently held in
${.CURDIR}/pkg directory to the toplevel of the package. It remains backward compatible with the existing system allowing a progressive transision process. The long term goal is a reduction of overheads and processing time when working with the cvs tree.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 151489d979f..dd157e3894d 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.832 2001/10/26 14:09:59 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.833 2001/10/26 15:08:43 wulf Exp $
#
# This file is in the public domain.
#
@@ -58,7 +58,11 @@ TEMPLATES?= ${PKGSRCDIR}/templates
PATCHDIR?= ${.CURDIR}/patches
SCRIPTDIR?= ${.CURDIR}/scripts
FILESDIR?= ${.CURDIR}/files
-PKGDIR?= ${.CURDIR}/pkg
+.if exists(${.CURDIR}/pkg)
+PKGDIR?= ${.CURDIR}/pkg
+.else
+PKGDIR?= ${.CURDIR}
+.endif
.if defined(USE_JAVA)
BUILD_DEFS+= PKG_JVM JAVA_HOME