Infused some multilib/get_libdir awareness

4 files changed, 30 insertions, 31 deletions

diff --git a/app-sci/blas-atlas/files/c-ATLAS b/app-sci/blas-atlas/files/c-ATLAS
index 06b980d00458..daa94f60839b 100644
--- a/app-sci/blas-atlas/files/c-ATLAS
+++ b/app-sci/blas-atlas/files/c-ATLAS
@@ -1,14 +1,14 @@
 CFLAGS="-I/usr/include/atlas"
-CLIBS="-L/usr/lib/blas/atlas -lcblas"
+CLIBS="-L/usr/$(get_libdir)/blas/atlas -lcblas"
  
 setup() {
- 
-einfo "/usr/lib/libcblas.so -> blas/atlas/libcblas.so"
-ln -sf blas/atlas/libcblas.so /usr/lib/libcblas.so
+MY_LIBDIR="$(get_libdir)"
+einfo "/usr/${MY_LIBDIR}/libcblas.so -> blas/atlas/libcblas.so"
+ln -sf blas/atlas/libcblas.so /usr/${MY_LIBDIR}/libcblas.so
 
-einfo "/usr/lib/libcblas.so.0 -> blas/atlas/libcblas.so.0"
-ln -sf blas/atlas/libcblas.so.0 /usr/lib/libcblas.so.0
+einfo "/usr/${MY_LIBDIR}/libcblas.so.0 -> blas/atlas/libcblas.so.0"
+ln -sf blas/atlas/libcblas.so.0 /usr/${MY_LIBDIR}/libcblas.so.0
  
-einfo "/usr/lib/libcblas.a -> blas/atlas/libcblas.a"
-ln -sf blas/atlas/libcblas.a /usr/lib/libcblas.a
-}
+einfo "/usr/${MY_LIBDIR}/libcblas.a -> blas/atlas/libcblas.a"
+ln -sf blas/atlas/libcblas.a /usr/${MY_LIBDIR}/libcblas.a
+
diff --git a/app-sci/blas-atlas/files/c-threaded-ATLAS b/app-sci/blas-atlas/files/c-threaded-ATLAS
index 6973831fe81e..9e36f057a500 100644
--- a/app-sci/blas-atlas/files/c-threaded-ATLAS
+++ b/app-sci/blas-atlas/files/c-threaded-ATLAS
@@ -1,15 +1,14 @@
 CFLAGS="-I/usr/include/atlas"
-CLIBS="-L/usr/lib/blas/threaded-atlas -lcblas"
+CLIBS="-L/usr/$(get_libdir)/blas/threaded-atlas -lcblas"
 
 setup() {
- 
-einfo "/usr/lib/libcblas.so -> blas/threaded-atlas/libcblas.so"
-ln -sf blas/threaded-atlas/libcblas.so /usr/lib/libcblas.so
+MY_LIBDIR="$(get_libdir)" 
+einfo "/usr/${MY_LIBDIR}/libcblas.so -> blas/threaded-atlas/libcblas.so"
+ln -sf blas/threaded-atlas/libcblas.so /usr/${MY_LIBDIR}/libcblas.so
 
-einfo "/usr/lib/libcblas.so.0 -> blas/threaded-atlas/libcblas.so.0"
-ln -sf blas/threaded-atlas/libcblas.so.0 /usr/lib/libcblas.so.0
+einfo "/usr/${MY_LIBDIR}/libcblas.so.0 -> blas/threaded-atlas/libcblas.so.0"
+ln -sf blas/threaded-atlas/libcblas.so.0 /usr/${MY_LIBDIR}/libcblas.so.0
  
-einfo "/usr/lib/libcblas.a -> blas/threaded-atlas/libcblas.a"
-ln -sf blas/threaded-atlas/libcblas.so.0 /usr/lib/libcblas.a
-
+einfo "/usr/${MY_LIBDIR}/libcblas.a -> blas/threaded-atlas/libcblas.a"
+ln -sf blas/threaded-atlas/libcblas.so.0 /usr/${MY_LIBDIR}/libcblas.a"
 }
diff --git a/app-sci/blas-atlas/files/f77-ATLAS b/app-sci/blas-atlas/files/f77-ATLAS
index 65603f1facd7..550187d862a2 100644
--- a/app-sci/blas-atlas/files/f77-ATLAS
+++ b/app-sci/blas-atlas/files/f77-ATLAS
@@ -1,14 +1,14 @@
-F77LIBS="-L/usr/lib/blas/atlas -lblas"
+F77LIBS="-L/usr/$(get_libdir)/blas/atlas -lblas"
 
 setup() {
- 
-einfo "/usr/lib/libblas.so -> blas/atlas/libblas.so"
-ln -sf blas/atlas/libblas.so /usr/lib/libblas.so
+MY_LIBDIR="$(get_libdir)" 
+einfo "/usr/${MY_LIBDIR}/libblas.so -> blas/atlas/libblas.so"
+ln -sf blas/atlas/libblas.so /usr/${MY_LIBDIR}/libblas.so
 
-einfo "/usr/lib/libblas.so.0 -> blas/atlas/libblas.so.0"
-ln -sf blas/atlas/libblas.so.0 /usr/lib/libblas.so.0
+einfo "/usr/${MY_LIBDIR}/libblas.so.0 -> blas/atlas/libblas.so.0"
+ln -sf blas/atlas/libblas.so.0 /usr/${MY_LIBDIR}/libblas.so.0
  
-einfo "/usr/lib/libblas.a -> blas/atlas/libblas.a"
-ln -sf blas/atlas/libblas.a /usr/lib/libblas.a
+einfo "/usr/${MY_LIBDIR}/libblas.a -> blas/atlas/libblas.a"
+ln -sf blas/atlas/libblas.a /usr/${MY_LIBDIR}/libblas.a
 
 }
diff --git a/app-sci/blas-atlas/files/f77-threaded-ATLAS b/app-sci/blas-atlas/files/f77-threaded-ATLAS
index af9c73fb039a..3099368af96e 100644
--- a/app-sci/blas-atlas/files/f77-threaded-ATLAS
+++ b/app-sci/blas-atlas/files/f77-threaded-ATLAS
@@ -1,14 +1,14 @@
-F77LIBS="-L/usr/lib/blas/threaded-atlas -lblas"
+F77LIBS="-L/usr/${MY_LIBDIR}/blas/threaded-atlas -lblas"
 
 setup() {
- 
+MY_LIBDIR="$(get_libdir)" 
 einfo "/usr/lib/libblas.so -> blas/threaded-atlas/libblas.so"
-ln -sf blas/threaded-atlas/libblas.so /usr/lib/libblas.so
+ln -sf blas/threaded-atlas/libblas.so /usr/${MY_LIBDIR}/libblas.so
 
 einfo "/usr/lib/libblas.so.0 -> blas/threaded-atlas/libblas.so.0"
-ln -sf blas/threaded-atlas/libblas.so.0 /usr/lib/libblas.so.0
+ln -sf blas/threaded-atlas/libblas.so.0 /usr/${MY_LIBDIR}/libblas.so.0
  
 einfo "/usr/lib/libblas.a -> blas/threaded-atlas/libblas.a"
-ln -sf blas/threaded-atlas/libblas.a /usr/lib/libblas.a
+ln -sf blas/threaded-atlas/libblas.a /usr/${MY_LIBDIR}/libblas.a
 
 }