From 88f235ebc6b076ec75956d36cfa9a8d19cca2899 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 15 Aug 2017 11:22:54 +0000 Subject: Set DESTDIR explicitly in a few cases. This makes life easier when converting to BuildStream, as BuildStream doesn't set DESTDIR in the environment. --- strata/devtools/git.morph | 2 +- strata/docutils/xml-catalog.morph | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'strata') diff --git a/strata/devtools/git.morph b/strata/devtools/git.morph index 40945640..da7a8c04 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 34ba0306..f0f589d3 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 -- cgit v1.2.1