Remove \ before make, use new mpi module names

epel9
Orion Poplawski 13 years ago
parent d22ee46f8b
commit e5e6dcc4f2

@ -181,7 +181,7 @@ for mpi in %{mpi_list}
do do
mkdir $mpi mkdir $mpi
pushd $mpi pushd $mpi
module load $mpi-%{_arch} module load mpi/$mpi-%{_arch}
ln -s ../configure . ln -s ../configure .
%configure \ %configure \
%{configure_opts} \ %{configure_opts} \
@ -191,7 +191,7 @@ do
--sbindir=%{_libdir}/$mpi/sbin \ --sbindir=%{_libdir}/$mpi/sbin \
--includedir=%{_includedir}/$mpi-%{_arch} \ --includedir=%{_includedir}/$mpi-%{_arch} \
--datarootdir=%{_libdir}/$mpi/share \ --datarootdir=%{_libdir}/$mpi/share \
--mandir=%{_libdir}/$mpi/share/man \ --mandir=%{_libdir}/$mpi/share/man
make make
module purge module purge
popd popd
@ -203,7 +203,7 @@ make -C build install DESTDIR=${RPM_BUILD_ROOT}
rm $RPM_BUILD_ROOT/%{_libdir}/*.la rm $RPM_BUILD_ROOT/%{_libdir}/*.la
for mpi in %{mpi_list} for mpi in %{mpi_list}
do do
module load $mpi-%{_arch} module load mpi/$mpi-%{_arch}
make -C $mpi install DESTDIR=${RPM_BUILD_ROOT} make -C $mpi install DESTDIR=${RPM_BUILD_ROOT}
rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la
module purge module purge
@ -255,7 +255,7 @@ make -C build check
export HDF5_Make_Ignore=yes export HDF5_Make_Ignore=yes
for mpi in %{mpi_list} for mpi in %{mpi_list}
do do
module load $mpi-%{_arch} module load mpi/$mpi-%{_arch}
make -C $mpi check make -C $mpi check
module purge module purge
done done

Loading…
Cancel
Save