diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-15 18:54:48 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-15 18:54:48 -0700 |
| commit | d493a029add855e6ade95d60b57ec7b8f5aba067 (patch) | |
| tree | a926b844dafa65a78857deb823abbdc729b3696e /man | |
| parent | 9f6ad12cbbea42c06b92d08e336ce5c7091a9227 (diff) | |
| download | portage-d493a029add855e6ade95d60b57ec7b8f5aba067.tar.gz portage-d493a029add855e6ade95d60b57ec7b8f5aba067.tar.bz2 portage-d493a029add855e6ade95d60b57ec7b8f5aba067.zip | |
Add support for /etc/portage/make.conf. If present, this file will
override settings from /etc/make.conf.
Diffstat (limited to 'man')
| -rw-r--r-- | man/make.conf.5 | 4 | ||||
| -rw-r--r-- | man/portage.5 | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/man/make.conf.5 b/man/make.conf.5 index d110b3acd..540a15e4b 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -2,7 +2,7 @@ .SH "NAME" make.conf \- custom settings for Portage .SH "SYNOPSIS" -.B /etc/make.conf +\fB/etc/make.conf\fR and \fB/etc/portage/make.conf\fR .SH "DESCRIPTION" This file contains various variables that are used by Portage. Portage will check the currently\-defined environment variables @@ -809,7 +809,7 @@ Saleem Abdulrasool <compnerd@gentoo.org> .fi .SH "FILES" .TP -.B /etc/make.conf +\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 diff --git a/man/portage.5 b/man/portage.5 index c3e8d8655..d13eee524 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -48,6 +48,7 @@ virtuals bashrc categories color.map +make.conf mirrors modules package.keywords @@ -437,6 +438,10 @@ media\-other .BR color.map Contains variables customizing colors. See \fBcolor.map\fR(5). .TP +.BR make.conf +The global custom settings for Portage. See \fBmake.conf\fR(5). +If present, this file will override settings from /etc/make.conf. +.TP .BR mirrors Whenever portage encounters a mirror:// style URI it will look up the actual hosts here. If the mirror set is not found here, it will check the global |