>From d29a7d4775aa9e8b148f17ea66d94b5ce661a00f Mon Sep 17 00:00:00 2001 From: Akira Yokosawa <akiyks@xxxxxxxxx> Date: Sat, 1 Feb 2020 22:19:52 +0900 Subject: [PATCH] Makefile: Add command line for Inkscape 1.0 Inkscape 1.0 (now in beta) has changed command-line options [1]. The option "--export-pdf" is no longer available in 1.0. Add a conditional command line with the right option of "--export-file". Tested with inkscape-1.0-0.beta.fc31.4.x86_64.rpm on Fedora 31. [1]: https://wiki.inkscape.org/wiki/index.php?title=Using_the_Command_Line#Deprecations_and_Replacements Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx> --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile index d39ab571..c1a51bae 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,9 @@ DOT := $(shell which dot 2>/dev/null) FIG2EPS := $(shell which fig2eps 2>/dev/null) A2PING := $(shell which a2ping 2>/dev/null) INKSCAPE := $(shell which inkscape 2>/dev/null) +ifdef INKSCAPE + INKSCAPE_ONE := $(shell inkscape --version | grep -c "Inkscape 1") +endif LATEXPAND := $(shell which latexpand 2>/dev/null) QPDF := $(shell which qpdf 2>/dev/null) @@ -359,7 +362,11 @@ endif ifeq ($(NEEDMDSYMBOL),1) $(error Font package 'mdsymbol' not found. See #9 in FAQ-BUILD.txt) endif +ifeq ($(INKSCAPE_ONE),0) @inkscape --export-pdf=$@ $<i > /dev/null 2>&1 +else + @inkscape --export-file=$@ $<i > /dev/null 2>&1 +endif @rm -f $<i ifeq ($(chkpagegroup),on) ifndef QPDF -- 2.17.1
