summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/asciidoc-py3/package.py2
-rw-r--r--var/spack/repos/builtin/packages/docbook-xml/package.py10
-rw-r--r--var/spack/repos/builtin/packages/docbook-xsl/package.py4
3 files changed, 13 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/asciidoc-py3/package.py b/var/spack/repos/builtin/packages/asciidoc-py3/package.py
index b8c9d9f03a..5bfe18f7da 100644
--- a/var/spack/repos/builtin/packages/asciidoc-py3/package.py
+++ b/var/spack/repos/builtin/packages/asciidoc-py3/package.py
@@ -23,3 +23,5 @@ class AsciidocPy3(AutotoolsPackage):
depends_on('python@3.5:', type=('build', 'run'))
depends_on('libxml2', type=('build', 'run'))
depends_on('libxslt', type=('build', 'run'))
+ depends_on('docbook-xml', type=('build', 'run'))
+ depends_on('docbook-xsl', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py
index 257d2566f8..35b6669a50 100644
--- a/var/spack/repos/builtin/packages/docbook-xml/package.py
+++ b/var/spack/repos/builtin/packages/docbook-xml/package.py
@@ -20,6 +20,14 @@ class DocbookXml(Package):
def install(self, spec, prefix):
install_tree('.', prefix)
+ @property
+ def catalog(self):
+ return os.path.join(self.prefix, 'catalog.xml')
+
def setup_run_environment(self, env):
- catalog = os.path.join(self.prefix, 'catalog.xml')
+ catalog = self.catalog
env.set('XML_CATALOG_FILES', catalog, separator=' ')
+
+ def setup_dependent_build_environment(self, env, dependent_spec):
+ catalog = self.catalog
+ env.set("XML_CATALOG_FILES", catalog, separator=' ')
diff --git a/var/spack/repos/builtin/packages/docbook-xsl/package.py b/var/spack/repos/builtin/packages/docbook-xsl/package.py
index 9533f3950c..8b7d84007a 100644
--- a/var/spack/repos/builtin/packages/docbook-xsl/package.py
+++ b/var/spack/repos/builtin/packages/docbook-xsl/package.py
@@ -28,8 +28,8 @@ class DocbookXsl(Package):
def setup_run_environment(self, env):
catalog = self.catalog
- env.set('XML_CATALOG_FILES', catalog, separator=' ')
+ env.prepend_path('XML_CATALOG_FILES', catalog, separator=' ')
def setup_dependent_build_environment(self, env, dependent_spec):
catalog = self.catalog
- env.prepend_path("XML_CATALOG_FILES", catalog)
+ env.prepend_path("XML_CATALOG_FILES", catalog, separator=' ')