summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2001-12-15 20:25:34 +0000
committeragc <agc@pkgsrc.org>2001-12-15 20:25:34 +0000
commitccff9099bcc040b948d88c32959fa8204a9900f4 (patch)
tree8f67a7596dd99f5fb7729eb89ce6b6a3af3c8f95 /pkgtools
parent36ce7249f893aba53d41fe7e3db33c37e3ba143a (diff)
downloadpkgsrc-ccff9099bcc040b948d88c32959fa8204a9900f4.tar.gz
Modify all references to PKGSRCDIR to _PKGSRCDIR, except in the external
references of the pkglint package. _PKGSRCDIR is an internal definition in bsd.pkg.mk, and a few packages which would like to refer to other packages in the build tree. It should not be set by users, but neither should it stop a user from building a package if it is defined, so make it obvious that this is the case.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkgdep/Makefile4
-rw-r--r--pkgtools/pkgdiff/Makefile5
-rw-r--r--pkgtools/pkglint/Makefile9
3 files changed, 8 insertions, 10 deletions
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index dec6e19833d..b00de4ae4bd 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:42 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/15 20:25:39 agc Exp $
#
DISTNAME= pkgdep-1.0
@@ -19,7 +19,7 @@ NO_CONFIGURE= yes
do-build:
${CP} ${FILESDIR}/pkgdep.pl ${WRKDIR}/pkgdep
-# ${SED} -e 's|/usr/pkgsrc|${PKGSRCDIR}|' \
+# ${SED} -e 's|/usr/pkgsrc|${_PKGSRCDIR}|' \
# ${FILESDIR}/pkgdep.pl > ${WRKDIR}/pkgdep
do-install:
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index cb46208a3ea..c20a4b3bcda 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/12/03 14:30:16 seb Exp $
+# $NetBSD: Makefile,v 1.22 2001/12/15 20:25:39 agc Exp $
#
DISTNAME= pkgdiff-0.103
@@ -19,8 +19,7 @@ NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
-PKGSRCDIR?= ${.CURDIR}/../..
-MAKE_ENV= PKGSRCDIR=${PKGSRCDIR}
+MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index ed29169296d..09c9325270f 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2001/12/03 21:55:48 wiz Exp $
+# $NetBSD: Makefile,v 1.120 2001/12/15 20:25:39 agc Exp $
#
DISTNAME= pkglint-3.16
@@ -20,8 +20,7 @@ NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
-PKGSRCDIR?= ${.CURDIR}/../..
-MAKE_ENV= PKGSRCDIR=${PKGSRCDIR}
+MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR}
DISTVER= ${DISTNAME:S/pkglint-//}
@@ -38,14 +37,14 @@ NROFF= nroff -mandoc
do-build:
.for FILE in pkglint lintpkgsrc plist-clash
${SED} -e 's|@PREFIX@|${PREFIX}|g' \
- -e 's|@PORTSDIR@|${PKGSRCDIR}|g' \
+ -e 's|@PORTSDIR@|${_PKGSRCDIR}|g' \
-e 's|@DISTVER@|${DISTVER}|g' \
< ${FILESDIR}/${FILE}.pl \
> ${WRKSRC}/${FILE}
.endfor
.for FILE in pkglint lintpkgsrc
${SED} -e 's|@PREFIX@|${PREFIX}|g' \
- -e 's|@PORTSDIR@|${PKGSRCDIR}|g' \
+ -e 's|@PORTSDIR@|${_PKGSRCDIR}|g' \
< ${FILESDIR}/${FILE}.1 \
> ${WRKSRC}/${FILE}.1
${NROFF} ${WRKSRC}/${FILE}.1 >${WRKSRC}/${FILE}.0