diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-12 08:50:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-12 08:50:35 +0000 |
| commit | 56b166d2443be3ffc8402e3561ac98f731ff22c2 (patch) | |
| tree | e2c4d78f2328a46566f0cb73972e1b8b31da4f38 | |
| parent | 79c50e74d2699e55ca84f7392256f61886999a24 (diff) | |
| download | portage-56b166d2443be3ffc8402e3561ac98f731ff22c2.tar.gz portage-56b166d2443be3ffc8402e3561ac98f731ff22c2.tar.bz2 portage-56b166d2443be3ffc8402e3561ac98f731ff22c2.zip | |
* Fix type in econf --host argument.
* Add missing econf --build and --target arguments.
* Use tabs instead of spaces for indentation.
svn path=/main/trunk/; revision=15048
| -rw-r--r-- | doc/package/ebuild/eapi/3.docbook | 38 | ||||
| -rw-r--r-- | man/ebuild.5 | 10 |
2 files changed, 26 insertions, 22 deletions
diff --git a/doc/package/ebuild/eapi/3.docbook b/doc/package/ebuild/eapi/3.docbook index 7bab213bb..4665b0955 100644 --- a/doc/package/ebuild/eapi/3.docbook +++ b/doc/package/ebuild/eapi/3.docbook @@ -24,15 +24,17 @@ when appropriate. For example, see econf and einstall below. <title>econf</title> <programlisting> ${ECONF_SOURCE:-.}/configure \ - --prefix="${EPREFIX}"/usr \ - --host="${EPREFIX}${CHOST} \ - --mandir="${EPREFIX}"/usr/share/man \ - --infodir="${EPREFIX}"/usr/share/info \ - --datadir="${EPREFIX}"/usr/share \ - --sysconfdir="${EPREFIX}"/etc \ - --localstatedir="${EPREFIX}"/var/lib \ - ${EXTRA_ECONF} \ - configure options || die "econf failed" + ${CBUILD:+--build=${CBUILD}} \ + --datadir="${EPREFIX}"/usr/share \ + --host=${CHOST} \ + --infodir="${EPREFIX}"/usr/share/info \ + --localstatedir="${EPREFIX}"/var/lib \ + --prefix="${EPREFIX}"/usr \ + --mandir="${EPREFIX}"/usr/share/man \ + --sysconfdir="${EPREFIX}"/etc \ + ${CTARGET:+--target=${CTARGET}} \ + ${EXTRA_ECONF} \ + configure options || die "econf failed" </programlisting> </section> <section id='package-ebuild-eapi-3_pre2-prefix-helpers-einstall'> @@ -43,15 +45,15 @@ DESTDIR=${D} rather than ${ED}) is still preferred over einstall. </para> <programlisting> make \ - prefix=${ED}/usr \ - datadir=${ED}/usr/share \ - infodir=${ED}/usr/share/info \ - localstatedir=${ED}/var/lib \ - mandir=${ED}/usr/share/man \ - sysconfdir=${ED}/etc \ - ${EXTRA_EINSTALL} \ - make options \ - install + prefix=${ED}/usr \ + datadir=${ED}/usr/share \ + infodir=${ED}/usr/share/info \ + localstatedir=${ED}/var/lib \ + mandir=${ED}/usr/share/man \ + sysconfdir=${ED}/etc \ + ${EXTRA_EINSTALL} \ + make options \ + install </programlisting> </section> </section> diff --git a/man/ebuild.5 b/man/ebuild.5 index 4872d56d4..b3521e222 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -783,13 +783,15 @@ directory. The function will append \fIsource\fR to the \fBDISTDIR\fR variable. This is used as a replacement for configure. Performs: .nf ${\fIECONF_SOURCE\fR:-.}/configure \\ + ${CBUILD:+\-\-build=${CBUILD}} \\ + \-\-datadir="${EPREFIX}"/usr/share \\ + \-\-host=${CHOST} \\ + \-\-infodir="${EPREFIX}"/usr/share/info \\ + \-\-localstatedir="${EPREFIX}"/var/lib \\ \-\-prefix="${EPREFIX}"/usr \\ - \-\-host="${EPREFIX}${CHOST} \\ \-\-mandir="${EPREFIX}"/usr/share/man \\ - \-\-infodir="${EPREFIX}"/usr/share/info \\ - \-\-datadir="${EPREFIX}"/usr/share \\ \-\-sysconfdir="${EPREFIX}"/etc \\ - \-\-localstatedir="${EPREFIX}"/var/lib \\ + ${CTARGET:+\-\-target=${CTARGET}} \\ \fI${EXTRA_ECONF}\fR \\ \fIconfigure options\fR || die "econf failed" .fi |