From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Apr 2021 14:52:50 +0000 (+0100)
Subject: Makefile: Tolerate inkscape flail
X-Git-Tag: otter-0.5.0~46
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=66e3aa82fef6626a3f29f2eb190d9615c4d102e9;p=otter.git

Makefile: Tolerate inkscape flail

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

diff --git a/Makefile b/Makefile
index 952089a9..fa09d22b 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,9 @@ SPHINXBUILD   = sphinx-build
 
 ifndef INKSCAPE_EXTENSIONS
 INKSCAPE ?= inkscape
-INKSCAPE_EXTENSIONS := $(shell $(INKSCAPE) -x)
+# inkscape 0.92.4: --extension-directory works, no --system-data-directory
+# inkscape 1.0.2: --system-data-directory, no --extension-directory
+INKSCAPE_EXTENSIONS := $(shell set -e; { sdd=$$( inkscape --system-data-directory ) && echo "$$sdd/extensions"; } || inkscape --extension-directory )
 endif
 RECOLOUR_SVG ?= $(INKSCAPE_EXTENSIONS)/color_replace.py