diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-19 18:42:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-19 18:42:24 -0700 |
| commit | 59d49a224ea5d008ce9eb2cdd312e3f46870fa4b (patch) | |
| tree | 5c67e5b4de50ca2d11c6fefca2e3fc614b2a6c2a /man/make.conf.5 | |
| parent | 72c0773f386df7e99e94bac877cb1c60db58833b (diff) | |
| download | portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.tar.gz portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.tar.bz2 portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.zip | |
Update docs, comments, and messages to refer to make.globals in
/usr/share/portage/config/ instead of /etc/make.globals.
Diffstat (limited to 'man/make.conf.5')
| -rw-r--r-- | man/make.conf.5 | 4 |
1 files changed, 2 insertions, 2 deletions
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 |