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 /make.conf.txt | |
| 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 'make.conf.txt')
| -rw-r--r-- | make.conf.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make.conf.txt b/make.conf.txt index 5482b5021..4531ed859 100644 --- a/make.conf.txt +++ b/make.conf.txt @@ -17,7 +17,8 @@ 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 the profile's default setting from /etc/make.profile/make.defaults. If no setting is found there, -it finally checks /etc/make.globals. Please note that all user +it finally checks make.globals. +Please note that all user settings should be made in the environment or in /etc/make.conf, which is intended to be customized by the user. @@ -692,7 +693,7 @@ FILES /etc/make.conf Contains user-supplied variables and overwrites those in make.defaults. -/etc/make.globals +/usr/share/portage/config/make.globals Contains portage defaults for many variables listed here. Don't change this, edit /etc/make.conf instead. |