summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-08-15 11:22:54 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-08-15 12:23:44 (GMT)
commit88f235ebc6b076ec75956d36cfa9a8d19cca2899 (patch)
tree43672e2743e01f79e66f230b0c229e2eea507c2f
parent2b2fe98a46645f097f7b0f8d6e9a13a9b8e9c253 (diff)
downloaddefinitions-sam/explicit-destdir.tar.gz
Set DESTDIR explicitly in a few cases.sam/explicit-destdir
This makes life easier when converting to BuildStream, as BuildStream doesn't set DESTDIR in the environment.
-rw-r--r--strata/devtools/git.morph2
-rw-r--r--strata/docutils/xml-catalog.morph2
2 files changed, 2 insertions, 2 deletions
diff --git a/strata/devtools/git.morph b/strata/devtools/git.morph
index 4094564..da7a8c0 100644
--- a/strata/devtools/git.morph
+++ b/strata/devtools/git.morph
@@ -6,6 +6,6 @@ pre-configure-commands:
build-commands:
- make all doc
install-commands:
-- make install install-doc
+- make DESTDIR="$DESTDIR" install install-doc
post-install-commands:
- install -D -m 644 -t "$DESTDIR"/etc/bash_completion.d/. contrib/completion/git-completion.bash
diff --git a/strata/docutils/xml-catalog.morph b/strata/docutils/xml-catalog.morph
index 34ba030..f0f589d 100644
--- a/strata/docutils/xml-catalog.morph
+++ b/strata/docutils/xml-catalog.morph
@@ -3,4 +3,4 @@ kind: chunk
install-commands:
- make DESTDIR="$DESTDIR" install
post-install-commands:
-- ./post-install.sh
+- DESTDIR="$DESTDIR" ./post-install.sh