From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 12 May 2007 19:15:39 +0000 (-0000)
Subject: s:${PORTDIR}:/usr/portage: so that it's not implied that those variables are automati... 
X-Git-Tag: v2.2_pre1~1434
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44be2d7975202cf72499ce0db22a955c3e4d6b35;p=portage.git

s:${PORTDIR}:/usr/portage: so that it's not implied that those variables are automatically relative to ${PORTDIR} when the value of ${PORTDIR} has changed to something other than /usr/portage.  Thanks to kerframil for reporting.

svn path=/main/trunk/; revision=6523
---

diff --git a/cnf/make.conf b/cnf/make.conf
index 9b08bc517..bb5b4e0c4 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -85,12 +85,12 @@
 #     it. The entire repository of tarballs for Gentoo is 9G. This is
 #     considerably more than any user will ever download. 2-3G is
 #     a large DISTDIR.
-#DISTDIR=${PORTDIR}/distfiles
+#DISTDIR=/usr/portage/distfiles
 #
 # PKGDIR is the location of binary packages that you can have created
 #     with '--buildpkg' or '-b' while emerging a package. This can get
 #     up to several hundred megs, or even a few gigs.
-#PKGDIR=${PORTDIR}/packages
+#PKGDIR=/usr/portage/packages
 #
 # PORT_LOGDIR is the location where portage will store all the logs it
 #     creates from each individual merge. They are stored as NNNN-$PF.log
diff --git a/man/make.conf.5 b/man/make.conf.5
index bf0c4cdc4..a0d95c022 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -98,7 +98,7 @@ as \fI\-\-target=${CTARGET}\fR only if it is defined.
 \fBDISTDIR\fR = \fI[path]\fR
 Defines the location of your local source file repository.
 .br
-Defaults to ${PORTDIR}/distfiles.
+Defaults to /usr/portage/distfiles.
 .TP
 .B DOC_SYMLINKS_DIR
 If this variable contains a directory then symlinks to html documentation will
@@ -316,7 +316,7 @@ Defaults to false.
 \fBPKGDIR\fR = \fI[path]\fR
 Defines the location where created .tbz2 binary packages will be stored.
 .br
-Defaults to ${PORTDIR}/packages.
+Defaults to /usr/portage/packages.
 .TP
 .B PORT_LOGDIR
 This variable defines the directory in which per\-ebuild logs are kept.