From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 14 Sep 2021 23:06:39 +0000 (+0100)
Subject: Makefile: don't override environment's SPHINXBUILD or NAILING_CARGO
X-Git-Tag: otter-1.0.0~162
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=df2a8a8419163cf085aa840febe1b4527e5f903d;p=otter.git

Makefile: don't override environment's SPHINXBUILD or NAILING_CARGO

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile b/Makefile
index 36f13aaf..29367ce7 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ WASM_BINDGEN_OPTIONS =						\
 
 BUNDLE_SOURCES ?= bundle-rust-sources
 
-SPHINXBUILD   = sphinx-build
+SPHINXBUILD   ?= sphinx-build
 
 ifndef INKSCAPE_EXTENSIONS
 INKSCAPE ?= inkscape
@@ -70,7 +70,7 @@ PUBLISHED_BRANCH=published
 
 ifneq (,$(wildcard ../Cargo.nail))
 
-NAILING_CARGO = nailing-cargo
+NAILING_CARGO ?= nailing-cargo
 CARGO = $(NAILING_CARGO)
 BUILD_SUBDIR ?= ../Build
 TARGET_DIR = $(BUILD_SUBDIR)/$(notdir $(PWD))/target