From 6c5d404a5830f3c395c91d0094c294a30f2baec6 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 7 Oct 2004 02:01:37 +0000 Subject: * 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. --- pkgtools/pkgdepgraph/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgtools/pkgdepgraph') diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile index 5a3fe84a156..f920f29ac50 100644 --- a/pkgtools/pkgdepgraph/Makefile +++ b/pkgtools/pkgdepgraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/07/28 01:42:43 atatat Exp $ +# $NetBSD: Makefile,v 1.18 2004/10/07 02:01:38 jlam Exp $ # DISTNAME= pkgdepgraph-2.7 @@ -33,14 +33,14 @@ do-build: .for FILE in pkgdepgraph ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g' \ - -e 's|@PKGSRCDIR@|${_PKGSRCDIR}|g' \ + -e 's|@PKGSRCDIR@|${PKGSRCDIR}|g' \ -e 's|@DISTVER@|${DISTVER}|g' \ < ${WRKSRC}/${FILE}.pl \ > ${WRKSRC}/${FILE} .endfor .for FILE in pkgdepgraph.1 pkgdepgraph.0 ${SED} -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g' \ - -e 's|@PKGSRCDIR@|${_PKGSRCDIR}|g' \ + -e 's|@PKGSRCDIR@|${PKGSRCDIR}|g' \ < ${WRKSRC}/${FILE}.in \ > ${WRKSRC}/${FILE} .endfor -- cgit v1.2.3