[gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/

[Justin Bronder]

commit:     8aa5f237c622b4305b33fdba0c3fab964f1cf945
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 20:03:41 2016 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 20:11:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8aa5f237

sys-cluster/mpich: bring back sysconfdir logic

Package-Manager: portage-2.2.28

 sys-cluster/mpich/mpich-3.2-r2.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
index 33fe443..64ebfc0 100644
--- a/sys-cluster/mpich/mpich-3.2-r2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2-r2.ebuild
@@ -69,6 +69,13 @@ multilib_src_configure() {
 		c="${c} --enable-threads=single"
 	fi
 
+	if ! mpi_classed; then
+		c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+		c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+	else
+		c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
+	fi
+
 	export MPICHLIB_CFLAGS="${CFLAGS}"
 	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
 	export MPICHLIB_CXXFLAGS="${CXXFLAGS}"
@@ -77,16 +84,14 @@ multilib_src_configure() {
 	export MPICHLIB_LDFLAGS="${LDFLAGS}"
 	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
 
-	ECONF_SOURCE=${S} $(mpi_econf_args) econf \
+	ECONF_SOURCE=${S} econf $(mpi_econf_args) \
 		--enable-shared \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		--with-hwloc-prefix="${EPREFIX}/usr" \
 		${c} \
 		--with-pm=hydra \
 		--disable-fast \
 		--enable-versioning \
 		--with-hwloc-prefix=/usr \
-		$(mpi_classed && echo "--docdir=$(mpi_root)/usr/share/doc/${PF}") \
 		$(use_enable romio) \
 		$(use_enable cxx) \
 		$(multilib_native_use_enable fortran fortran all)