Various updates to the intltool package (#3545)

1 files changed, 27 insertions, 14 deletions

diff --git a/var/spack/repos/builtin/packages/intltool/package.py b/var/spack/repos/builtin/packages/intltool/package.py
index e934734691..0007326eba 100644
--- a/var/spack/repos/builtin/packages/intltool/package.py
+++ b/var/spack/repos/builtin/packages/intltool/package.py
@@ -25,23 +25,36 @@
 from spack import *
 
 
-class Intltool(Package):
+class Intltool(AutotoolsPackage):
     """intltool is a set of tools to centralize translation of many different
-       file formats using GNU gettext-compatible PO files.
+    file formats using GNU gettext-compatible PO files."""
 
-    """
-    homepage  = 'https://freedesktop.org/wiki/Software/intltool/'
+    homepage = 'https://freedesktop.org/wiki/Software/intltool/'
+    url      = 'https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz'
+    list_url = 'https://launchpad.net/intltool/+download'
 
-    version('0.51.0',    '12e517cac2b57a0121cda351570f1e63')
+    version('0.51.0', '12e517cac2b57a0121cda351570f1e63')
 
-    def url_for_version(self, version):
-        """Handle version-based custom URLs."""
-        return 'https://launchpad.net/intltool/trunk/%s/+download/intltool-%s.tar.gz' % (version, version)
+    # requires XML::Parser perl module
+    # depends_on('perl@5.8.1:', type='build')
 
-    def install(self, spec, prefix):
+    def check(self):
+        # `make check` passes but causes `make install` to fail
+        pass
 
-        # configure, build, install:
-        options = ['--prefix=%s' % prefix]
-        configure(*options)
-        make()
-        make('install')
+    def _make_executable(self, name):
+        return Executable(join_path(self.prefix.bin, name))
+
+    def setup_dependent_package(self, module, dependent_spec):
+        # intltool is very likely to be a build dependency,
+        # so we add the tools it provides to the dependent module
+        executables = [
+            'intltool-extract',
+            'intltoolize',
+            'intltool-merge',
+            'intltool-prepare',
+            'intltool-update'
+        ]
+
+        for name in executables:
+            setattr(module, name, self._make_executable(name))