fixed shared libs. cleaning

1 files changed, 21 insertions, 21 deletions

diff --git a/sci-libs/scotch/scotch-5.1.11-r1.ebuild b/sci-libs/scotch/scotch-5.1.11-r1.ebuild
index 210e339..f637117 100644
--- a/sci-libs/scotch/scotch-5.1.11-r1.ebuild
+++ b/sci-libs/scotch/scotch-5.1.11-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="sys-devel/bison
 	mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MYP}/src"
+S="${WORKDIR}/${MYP}"
 
 make_shared_lib() {
 	local libstatic=${1}
@@ -45,41 +45,40 @@ src_prepare() {
 		-e "s/@CC@/$(tc-getCC)/" \
 		-e "s/@AR@/$(tc-getAR)/" \
 		-e "s/@RANLIB@/$(tc-getRANLIB)/" \
-		"${FILESDIR}"/Makefile.inc.in > Makefile.inc || die
+		"${FILESDIR}"/Makefile.inc.in > src/Makefile.inc || die
 }
 
 src_compile() {
-	emake PICFLAGS=-fPIC
-	make_shared_lib libscotch/libscotcherr.a
-	make_shared_lib libscotch/libscotcherrexit.a
-	make_shared_lib libscotch/libscotch.a -L. -lscotcherr -lz -lm -lrt
-	make_shared_lib esmumps/libesmumps.a -Llibscotch -lscotch
-	make_shared_lib libscotchmetis/libscotchmetis.a -Llibscotch -lscotch
+	emake -C src PICFLAGS=-fPIC
+	make_shared_lib lib/libscotcherr.a
+	make_shared_lib lib/libscotcherrexit.a
+	make_shared_lib lib/libscotch.a -Llib -lscotcherr -lz -lm -lrt
+	make_shared_lib lib/libesmumps.a -Llib -lscotch
+	make_shared_lib lib/libscotchmetis.a -Llib -lscotch
 
 	if use mpi; then
-		emake PICFLAGS=-fPIC ptscotch
+		emake -C src PICFLAGS=-fPIC ptscotch
 		export LINK=mpicc
-		make_shared_lib libscotch/libptscotcherr.a
-		make_shared_lib libscotch/libptscotcherrexit.a
-		make_shared_lib libscotch/libptscotch.a -Llibscotch -lptscotcherr -lz -lm -lrt
-		make_shared_lib esmumps/libptesmumps.a -Llibscotch -lptscotch
-		make_shared_lib libscotchmetis/libptscotchparmetis.a -Llibscotch -lptscotch
+		make_shared_lib lib/libptscotcherr.a
+		make_shared_lib lib/libptscotcherrexit.a
+		make_shared_lib lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt
+		make_shared_lib lib/libptesmumps.a -Llib -lptscotch
+		make_shared_lib lib/libptscotchparmetis.a -Llib -lptscotch
 	fi
 	if use static-libs; then
-		emake clean
-		emake
-		use mpi && emake ptscotch
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
 	fi
 }
 
 src_install() {
-	cd ..
-	local l b m
-	for l in $(find . -name \*.so.\*); do
+	local l
+	for l in lib/*.so.*; do
 		dolib.so ${l}
 		dosym $(basename ${l}) /usr/$(get_libdir)/$(basename ${l%.*})
 	done
-	use static-libs && dolib.a $(find . -name \*.a)
+	use static-libs && dolib.a lib/*.a
 
 	insinto /usr/include/scotch
 	doins include/*
@@ -120,6 +119,7 @@ src_install() {
 	dodoc README.txt
 
 	if use tools; then
+		local b m
 		pushd bin > /dev/null
 		for b in *; do
 			newbin ${b} scotch_${b}