From 331f42b9911b0348cf287a5239d7d50cbdcd0ee5 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 14 Apr 2017 10:13:47 -0500 Subject: [PATCH] Convert Image-Magick to AutotoolsPackage (#3828) --- .../repos/builtin/packages/image-magick/package.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/image-magick/package.py b/var/spack/repos/builtin/packages/image-magick/package.py index e32f1967e2a..4683e422eaf 100644 --- a/var/spack/repos/builtin/packages/image-magick/package.py +++ b/var/spack/repos/builtin/packages/image-magick/package.py @@ -25,7 +25,7 @@ from spack import * -class ImageMagick(Package): +class ImageMagick(AutotoolsPackage): """ImageMagick is a software suite to create, edit, compose, or convert bitmap images.""" @@ -45,10 +45,9 @@ class ImageMagick(Package): depends_on('ghostscript') depends_on('ghostscript-fonts') - def install(self, spec, prefix): + def configure_args(self): + spec = self.spec gs_font_dir = join_path(spec['ghostscript-fonts'].prefix.share, "font") - configure('--prefix={0}'.format(prefix), - '--with-gs-font-dir={0}'.format(gs_font_dir)) - make() - make('check') - make('install') + return [ + '--with-gs-font-dir={0}'.format(gs_font_dir) + ]