summaryrefslogtreecommitdiffstats
path: root/man/make.conf.5
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-12 00:28:51 -0700
committerZac Medico <zmedico@gentoo.org>2012-09-12 00:28:51 -0700
commit96b053ac52fa37fdd61cbb76cb44dfb90fb49f86 (patch)
treeb1011e1b62a08e7b3da14bc097f60dbea72c830d /man/make.conf.5
parentea54077b59d2aec35add5c3f6779b6772f3127a5 (diff)
downloadportage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.tar.gz
portage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.tar.bz2
portage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.zip
Prefer /etc/portage/make.profile.v2.2.0_alpha126
This is the default location used by current versions of eselect profile, and will soon be the default location in stages. Since eselect profile generates a warning if both /etc/make.profile and /etc/portage/make.profile exist, the new default should be fairly safe (although eselect profile currently prefers /etc/make.profile when both exist).
Diffstat (limited to 'man/make.conf.5')
-rw-r--r--man/make.conf.54
1 files changed, 2 insertions, 2 deletions
diff --git a/man/make.conf.5 b/man/make.conf.5
index d9babe10f..e2a16a51d 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -13,7 +13,7 @@ Portage then checks the make.conf files. Both /etc/make.conf and
If no setting is found in the make.conf files, Portage checks
make.globals. If no
setting is found there, the profile's default setting is grabbed
-from /etc/make.profile/make.defaults. Please note that all user
+from /etc/portage/make.profile/make.defaults. Please note that all user
settings should be made in the environment or in the make.conf
files, which are intended to be customized by the user.
.br
@@ -855,7 +855,7 @@ This variable controls permissions for \fIWORKDIR\fR (see \fBebuild\fR(5)).
\fBPORTDIR\fR = \fI[path]\fR
Defines the location of the Portage tree. This is the repository for all
profile information as well as all ebuilds. If you change this, you must update
-your /etc/make.profile symlink accordingly.
+your /etc/portage/make.profile symlink accordingly.
.br
Defaults to /usr/portage.
.br