[hdf5] Remove \ before make, use new mpi module names

Orion Poplawski orion at fedoraproject.org
Wed Aug 29 18:34:54 UTC 2012


commit e5e6dcc4f2291559db37227ceed5eb2953bc1121
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Aug 29 12:34:43 2012 -0600

    Remove \ before make, use new mpi module names

 hdf5.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index 1718cd6..69a0ff8 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -181,7 +181,7 @@ for mpi in %{mpi_list}
 do
   mkdir $mpi
   pushd $mpi
-  module load $mpi-%{_arch}
+  module load mpi/$mpi-%{_arch}
   ln -s ../configure .
   %configure \
     %{configure_opts} \
@@ -191,7 +191,7 @@ do
     --sbindir=%{_libdir}/$mpi/sbin \
     --includedir=%{_includedir}/$mpi-%{_arch} \
     --datarootdir=%{_libdir}/$mpi/share \
-    --mandir=%{_libdir}/$mpi/share/man \
+    --mandir=%{_libdir}/$mpi/share/man
   make
   module purge
   popd
@@ -203,7 +203,7 @@ make -C build install DESTDIR=${RPM_BUILD_ROOT}
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 for mpi in %{mpi_list}
 do
-  module load $mpi-%{_arch}
+  module load mpi/$mpi-%{_arch}
   make -C $mpi install DESTDIR=${RPM_BUILD_ROOT}
   rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la
   module purge
@@ -255,7 +255,7 @@ make -C build check
 export HDF5_Make_Ignore=yes
 for mpi in %{mpi_list}
 do
-  module load $mpi-%{_arch}
+  module load mpi/$mpi-%{_arch}
   make -C $mpi check
   module purge
 done


More information about the scm-commits mailing list