From eb211569594d01f24d31569209e90edba5c8c212 Mon Sep 17 00:00:00 2001 From: Antonin Godard Date: Fri, 15 Nov 2024 15:35:41 +0100 Subject: Revert "doc: Makefile: remove inkscape, replace by rsvg-convert" This reverts commit 1ecb50eacc6510e1b77215fd6af36b1f7ffdeabe. (From yocto-docs rev: fd710eb3f15ed4d6a50cab52ba25c62dcd445a96) 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 cb8d4dea85..04d72592c4 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -13,8 +13,8 @@ SPHINXLINTDOCS ?= $(SOURCEDIR) IMAGEDIRS = */svg BUILDDIR = _build DESTDIR = final -SVG2PNG = rsvg-convert -SVG2PDF = rsvg-convert +SVG2PNG = inkscape +SVG2PDF = inkscape 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) --format=Pdf --output=$@ $< + $(SVG2PDF) --export-filename=$@ $< # Pattern rule for converting SVG to PNG %.png : %.svg - $(SVG2PNG) --format=Png --output=$@ $< + $(SVG2PNG) --export-filename=$@ $< clean: @rm -rf $(BUILDDIR) $(PNGs) $(PDFs) poky.yaml sphinx-static/switchers.js -- cgit v1.2.3-54-g00ecf