* Fix type in econf --host argument.

* Add missing econf --build and --target arguments.
* Use tabs instead of spaces for indentation. (trunk r15048)

svn path=/main/branches/2.1.7/; revision=15082

diff --git a/doc/package/ebuild/eapi/3.docbook b/doc/package/ebuild/eapi/3.docbook
index 7bab213bb28fa55b4bac7f9fa4ac27c0b9d98763..4665b095590aabe75b22bc2384e0250dd05a1940 100644 (file)
--- 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 d08f372b6263333c4d4700daf4be9c27c7fac47e..d0495e023cdc27469f5383529eb90c8d1a6cab3e 100644 (file)
--- 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