>From 07acec1a052399df5e38773111ab9bcf4153e826 Mon Sep 17 00:00:00 2001 From: Akira Yokosawa <akiyks@xxxxxxxxx> Date: Sun, 19 Apr 2020 23:43:09 +0900 Subject: [PATCH] Update output option for Inkscape 1.0 Inkscape 1.0-rc1 now undergoing public test has renamed the option "--export-file=" to "--export-filename=". This change is not reflected in the wiki page at [1] yet. "inkscape --help" says that the short option "-o output_file" is common to beta and rc1 versions. So this commit uses the short option instead. Also redirect pango version emitted to stderr by rc1's "inkscape --version". [1]: https://wiki.inkscape.org/wiki/index.php?title=Using_the_Command_Line#Deprecations_and_Replacements Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e24c5729..5fb252eb 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ 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") + INKSCAPE_ONE := $(shell inkscape --version 2>/dev/null | grep -c "Inkscape 1") endif LATEXPAND := $(shell which latexpand 2>/dev/null) QPDF := $(shell which qpdf 2>/dev/null) @@ -402,7 +402,7 @@ endif ifeq ($(INKSCAPE_ONE),0) @inkscape --export-pdf=$@ $<i > /dev/null 2>&1 else - @inkscape --export-file=$@ $<i > /dev/null 2>&1 + @inkscape -o $@ $<i > /dev/null 2>&1 endif @rm -f $<i ifeq ($(chkpagegroup),on) -- 2.17.1
