Merged the best of two Spack packages for Environment Modules.

Named "environment-modules" to be consistent with Fedora and Ubuntu repositories.

See d96ea5b for original packages/modules/package.py

2 files changed, 10 insertions, 29 deletions

diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py
index df903fddf8..cc5d76760e 100644
--- a/var/spack/repos/builtin/packages/environment-modules/package.py
+++ b/var/spack/repos/builtin/packages/environment-modules/package.py
@@ -2,7 +2,8 @@ from spack import *
 
 
 class EnvironmentModules(Package):
-    """Environment Modules for HPC"""
+    """The Environment Modules package provides for the dynamic
+    modification of a user's environment via modulefiles."""
 
     homepage = "https://sourceforge.net/p/modules/wiki/Home/"
     url      = "http://prdownloads.sourceforge.net/modules/modules-3.2.10.tar.gz"
@@ -16,12 +17,17 @@ class EnvironmentModules(Package):
         # See: https://sourceforge.net/p/modules/bugs/62/
         CPPFLAGS = ['-DUSE_INTERP_ERRORLINE']
         config_args = [
-            "--prefix=%s" % prefix,
-            "--with-tcl=%s" % join_path(spec['tcl'].prefix, 'lib'),    # It looks for tclConfig.sh
+            '--prefix=%s' % prefix,
+            '--disable-debug',
+            '--disable-dependency-tracking',
+            '--disable-silent-rules',
+            '--disable-versioning', 
+            '--datarootdir=%s' % prefix.share,
+            '--with-tcl=%s' % join_path(spec['tcl'].prefix, 'lib'),    # It looks for tclConfig.sh
             'CPPFLAGS=%s' % ' '.join(CPPFLAGS)
         ]
 
 
         configure(*config_args)
         make()
-        make("install")
+        make('install')
diff --git a/var/spack/repos/builtin/packages/modules/package.py b/var/spack/repos/builtin/packages/modules/package.py
deleted file mode 100644
index b014ee460c..0000000000
--- a/var/spack/repos/builtin/packages/modules/package.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from spack import *
-
-class Modules(Package):
-    """ The Environment Modules package provides for the dynamic modification of a user's environment via modulefiles. """
-
-    homepage = "http://modules.sf.net"
-    url      = "http://downloads.sourceforge.net/project/modules/Modules/modules-3.2.10/modules-3.2.10.tar.gz"
-
-    version('3.2.10', '8b097fdcb90c514d7540bb55a3cb90fb')
-
-    depends_on("tcl")
-
-    def install(self, spec, prefix):
-
-	options = ['--prefix=%s' % prefix, 
-                   '--disable-debug',
-                   '--disable-dependency-tracking',
-                   '--disable-silent-rules',
-                   '--disable-versioning', 
-                   '--datarootdir=%s' % prefix.share,
-                   'CPPFLAGS=-DUSE_INTERP_ERRORLINE']
-
-        configure(*options)
-        make()
-        make("install")