From 66e3aa82fef6626a3f29f2eb190d9615c4d102e9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 16 Apr 2021 15:52:50 +0100 Subject: [PATCH] Makefile: Tolerate inkscape flail Reported-by: Matthew Vernon Signed-off-by: Ian Jackson --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.30.2