summaryrefslogtreecommitdiffstats
path: root/man/emerge.1
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/emerge.1
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/emerge.1')
-rw-r--r--man/emerge.16
1 files changed, 3 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 679349054..a25c573bb 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1083,7 +1083,7 @@ Contains user package set definitions (see \fBportage\fR(5)).
Contains settings to handle automatic updates/backups of configuration
files.
.TP
-.B /etc/make.profile/make.defaults
+.B /etc/portage/make.profile/make.defaults
Contains profile\-specific variables for the build process. \fBDo not
edit this file\fR.
.TP
@@ -1091,11 +1091,11 @@ edit this file\fR.
Contains the master list of USE flags with descriptions of their
functions. \fBDo not edit this file\fR.
.TP
-.B /etc/make.profile/virtuals
+.B /etc/portage/make.profile/virtuals
Contains a list of default packages used to resolve virtual dependencies.
\fBDo not edit this file\fR.
.TP
-.B /etc/make.profile/packages
+.B /etc/portage/make.profile/packages
Contains a list of packages used for the base system. The \fBsystem\fR
and \fBworld\fR sets consult this file. \fBDo not edit this file\fR.
.TP