Update docs, comments, and messages to refer to make.globals in

/usr/share/portage/config/ instead of /etc/make.globals.

4 files changed, 20 insertions, 12 deletions

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1fcc383ee..8fa32e23f 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -811,7 +811,7 @@ variable which is disregarded for prior \fBEAPI\fR values.
 .TP
 \fBemake\fR \fI[make options]\fR
 This is used as a replacement for make.  Performs 'make ${MAKEOPTS}
-\fImake options\fR' (as set in /etc/make.globals), default is MAKEOPTS="\-j2".
+\fImake options\fR' (as set in make.globals), default is MAKEOPTS="\-j2".
 
 \fB***warning***\fR
 .br
@@ -1101,7 +1101,7 @@ The helper apps in \fI/usr/lib/portage/bin\fR.
 .B /etc/make.conf
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
-.B /etc/make.globals
+.B /usr/share/portage/config/make.globals
 Contains the default variables for the build\-process, you should edit
 \fI/etc/make.conf\fR instead.
 .TP
diff --git a/man/emerge.1 b/man/emerge.1
index 73c90d3fd..0f2360ff0 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -827,7 +827,7 @@ little bit untidy, it does prevent potentially valuable config files from being
 deleted, which is of paramount importance.
 .LP
 Protected directories are set using the \fICONFIG_PROTECT\fR variable, normally
-defined in /etc/make.globals. Directory exceptions to the CONFIG_PROTECTed
+defined in make.globals. Directory exceptions to the CONFIG_PROTECTed
 directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable. To find
 files that need to be updated in /etc, type \fBfind /etc \-iname \'._cfg????_*\'\fR.
 .LP
@@ -903,7 +903,7 @@ Contains a list of default packages used to resolve virtual dependencies.
 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
-.B /etc/make.globals
+.B /usr/share/portage/config/make.globals
 Contains the default variables for the build process.  \fBDo not edit
 this file\fR.
 .SH "SEE ALSO"
diff --git a/man/make.conf.5 b/man/make.conf.5
index 540a15e4b..cbedc3d19 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -8,7 +8,7 @@ This file contains various variables that are used by Portage.
 Portage will check the currently\-defined environment variables
 first for any settings.  If no environment settings are found,
 Portage then checks /etc/make.conf.  If no setting is found
-in /etc/make.conf, Portage checks /etc/make.globals. If no
+in make.conf, 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
 settings should be made in the environment or in /etc/make.conf,
@@ -812,7 +812,7 @@ Saleem Abdulrasool <compnerd@gentoo.org>
 \fB/etc/make.conf\fR and \fB/etc/portage/make.conf\fR
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
-.B /etc/make.globals
+.B /usr/share/portage/config/make.globals
 Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead.
 .TP
 .B /etc/portage/color.map
diff --git a/man/portage.5 b/man/portage.5
index 41224deb3..3a472a8ac 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -17,7 +17,6 @@ If you are looking for information on how to emerge something, please see
 .TP
 .BR /etc/
 .nf
-make.globals
 .BR make.conf (5)
 .fi
 .TP
@@ -87,6 +86,11 @@ use.desc
 use.local.desc
 .fi
 .TP
+.BR /usr/share/portage/config/
+.nf
+make.globals
+.fi
+.TP
 .BR /var/cache/edb/
 misc internal cache files
 .TP
@@ -136,11 +140,6 @@ More reading:
 .BR /etc/
 .RS
 .TP
-.BR make.globals
-The global default settings for Portage.  This comes from the portage package 
-itself.  Settings in \fBmake.conf\fR override values here.  The format 
-is described extensivly in \fBmake.conf\fR(5).
-.TP
 .BR make.conf
 The global custom settings for Portage.  See \fBmake.conf\fR(5).
 .RE
@@ -869,6 +868,15 @@ games\-emulation/xmess:net \- Adds network support
 .fi
 .RE
 .TP
+.BR /usr/share/portage/config/
+.RS
+.TP
+.BR make.globals
+The global default settings for Portage.  This comes from the portage package 
+itself.  Settings in \fBmake.conf\fR override values here.  The format 
+is described extensivly in \fBmake.conf\fR(5).
+.RE
+.TP
 .BR /var/cache/edb/
 .RS
 This directory is used to store internal portage cache files.  The names and