Index: /mpich2/trunk/src/packaging/envmods/Makefile.sm
===================================================================
--- /mpich2/trunk/src/packaging/envmods/Makefile.sm (revision 3761)
+++ /mpich2/trunk/src/packaging/envmods/Makefile.sm (revision 4886)
@@ -1,3 +1,1 @@
-datadir = @datadir@
-
-optinstall_DATADIR = mpich2.module
+optinstall_ETC = mpich2.module
Index: /mpich2/trunk/src/packaging/envmods/mpich2.module.in
===================================================================
--- /mpich2/trunk/src/packaging/envmods/mpich2.module.in (revision 3761)
+++ /mpich2/trunk/src/packaging/envmods/mpich2.module.in (revision 4886)
@@ -3,3 +3,5 @@
 #  MPICH2 module for use with 'environment-modules' package:
 # 
-prepend-path 		PATH 		@datadir@/bin
+setenv        prefix  @prefix@
+prepend-path  PATH    @datadir@/bin
+prepend-path  MANPATH @mandir@