diff options
author | Antonin Godard <antonin.godard@bootlin.com> | 2024-11-15 15:35:41 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-11-15 06:51:25 -0800 |
commit | eb211569594d01f24d31569209e90edba5c8c212 (patch) | |
tree | 2d7e61984588e60eb9260151d201e11af2694a2d | |
parent | d5f366385d81e7f1d3d749db3249100bc0b95987 (diff) | |
download | poky-eb211569594d01f24d31569209e90edba5c8c212.tar.gz |
Revert "doc: Makefile: remove inkscape, replace by rsvg-convert"
This reverts commit 1ecb50eacc6510e1b77215fd6af36b1f7ffdeabe.
(From yocto-docs rev: fd710eb3f15ed4d6a50cab52ba25c62dcd445a96)
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | documentation/Makefile | 8 |
1 files 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) | |||
13 | IMAGEDIRS = */svg | 13 | IMAGEDIRS = */svg |
14 | BUILDDIR = _build | 14 | BUILDDIR = _build |
15 | DESTDIR = final | 15 | DESTDIR = final |
16 | SVG2PNG = rsvg-convert | 16 | SVG2PNG = inkscape |
17 | SVG2PDF = rsvg-convert | 17 | SVG2PDF = inkscape |
18 | 18 | ||
19 | ifeq ($(shell if which $(SPHINXBUILD) >/dev/null 2>&1; then echo 1; else echo 0; fi),0) | 19 | ifeq ($(shell if which $(SPHINXBUILD) >/dev/null 2>&1; then echo 1; else echo 0; fi),0) |
20 | $(error "The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed") | 20 | $(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 | |||
41 | 41 | ||
42 | # Pattern rule for converting SVG to PDF | 42 | # Pattern rule for converting SVG to PDF |
43 | %.pdf : %.svg | 43 | %.pdf : %.svg |
44 | $(SVG2PDF) --format=Pdf --output=$@ $< | 44 | $(SVG2PDF) --export-filename=$@ $< |
45 | 45 | ||
46 | # Pattern rule for converting SVG to PNG | 46 | # Pattern rule for converting SVG to PNG |
47 | %.png : %.svg | 47 | %.png : %.svg |
48 | $(SVG2PNG) --format=Png --output=$@ $< | 48 | $(SVG2PNG) --export-filename=$@ $< |
49 | 49 | ||
50 | clean: | 50 | clean: |
51 | @rm -rf $(BUILDDIR) $(PNGs) $(PDFs) poky.yaml sphinx-static/switchers.js | 51 | @rm -rf $(BUILDDIR) $(PNGs) $(PDFs) poky.yaml sphinx-static/switchers.js |