From 4a5e9aa5a29ed0266ac5701c9b7cf5cc96113aa1 Mon Sep 17 00:00:00 2001 From: Antonin Godard Date: Wed, 6 Nov 2024 08:48:23 +0100 Subject: [PATCH] doc: Makefile: remove inkscape, replace by rsvg-convert Remove inkscape as it is not part of meta/, and use librsvg so we can ship it in a buildtools tarball for the autobuilder workers. (From yocto-docs rev: c45b401d8a1794dec2c5bd42633b9b7fac44ed82) Signed-off-by: Antonin Godard (cherry picked from commit 0caa432b888209bd80443df230143761e1faf415) Signed-off-by: Antonin Godard Signed-off-by: Steve Sakoman --- documentation/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/Makefile b/documentation/Makefile index 0bd9db5eae..541390b2a1 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -13,8 +13,8 @@ SPHINXLINTDOCS ?= $(SOURCEDIR) IMAGEDIRS = */svg BUILDDIR = _build DESTDIR = final -SVG2PNG = inkscape -SVG2PDF = inkscape +SVG2PNG = rsvg-convert +SVG2PDF = rsvg-convert ifeq ($(shell if which $(SPHINXBUILD) >/dev/null 2>&1; then echo 1; else echo 0; fi),0) $(error "The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed") @@ -41,11 +41,11 @@ PNGs := $(foreach dir, $(IMAGEDIRS), $(patsubst %.svg,%.png,$(wildcard $(SOURCED # Pattern rule for converting SVG to PDF %.pdf : %.svg - $(SVG2PDF) --export-filename=$@ $< + $(SVG2PDF) --format=Pdf --output=$@ $< # Pattern rule for converting SVG to PNG %.png : %.svg - $(SVG2PNG) --export-filename=$@ $< + $(SVG2PNG) --format=Png --output=$@ $< clean: @rm -rf $(BUILDDIR) $(PNGs) $(PDFs) poky.yaml sphinx-static/switchers.js releases.rst