A few fixes w.r.t. %{modulefile_path}

This commit was SVN r5618.

contrib/dist/linux/openmpi.spec

@@ -53,7 +53,7 @@
 # type: bool (0/1)
 %define install_modulefile 0
 # type: string (root path to install modulefiles)
-%define modulefile_path /etc/modulefiles/openmpi
+%define modulefile_path /etc/modulefiles
 # type: string (subdir to install modulefile)
 %define modulefile_subdir %{name}
 # type: string (name of modulefile)
@@ -217,8 +217,8 @@ export CFLAGS CXXFLAGS
 %if %{install_env_scripts}
 
 %if %{install_modulefile}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{modulepath}/%{name}/
-cat <<EOF >$RPM_BUILD_ROOT/%{modulepath}/%{name}/%{version}-%{release}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{modulefile_path}/%{modulefile_subdir}/
+cat <<EOF >$RPM_BUILD_ROOT/%{modulefile_path}/%{modulefile_subdir}/%{modulefile_name}
 #%Module
 
 # NOTE: This is an automatically-generated file!  (generated by the