From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 13 Dec 2009 03:53:48 +0000 (-0000)
Subject: * Fix type in econf --host argument.
X-Git-Tag: v2.1.7.14~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e65bf33985894cec62244dd21583b3a16df79a55;p=portage.git

* 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 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 d08f372b6..d0495e023 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