Skip to content

Commit 0051b2b

Browse files
committed
Simplify Inkscape invocation
1 parent 4a090c8 commit 0051b2b

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ favicon_default = pkgdown/favicon/apple-touch-icon.png
2828

2929
favicons = ${favicons_small} ${favicons_large} ${favicon_default}
3030

31-
inkscape = $(shell command -v inkscape || echo /Applications/Inkscape.app/Contents/MacOS/inkscape)
32-
3331
.PHONY: test
3432
## Run unit tests
3533
test: documentation
@@ -102,7 +100,7 @@ README.md: README.rmd NAMESPACE DESCRIPTION man/figures/logo.png
102100
${rscript} -e "devtools::load_all(export_all = FALSE); knitr::knit('$<')"
103101

104102
man/figures/logo.png: figures/logo.svg
105-
${inkscape} -w 240 --export-filename ${@:.png=.tmp.png} $<
103+
inkscape -w 240 --export-filename ${@:.png=.tmp.png} $<
106104
pngcrush ${@:.png=.tmp.png} $@
107105
${RM} ${@:.png=.tmp.png}
108106

@@ -134,7 +132,7 @@ favicons: ${favicons}
134132
export-favicon = \
135133
@sz=$$(sed 's/.*x\([[:digit:]]*\)\.png/\1/' <<<"$@") \
136134
&& set -x; \
137-
${inkscape} -w $$sz -h $$sz --export-area $1 --export-filename=${@D}/tmp-${@F} $< \
135+
inkscape -w $$sz -h $$sz --export-area $1 --export-filename=${@D}/tmp-${@F} $< \
138136
&& pngcrush -q ${@D}/tmp-${@F} $@ && rm ${@D}/tmp-${@F}
139137

140138
${favicons_small}: figures/logo.svg | pkgdown/favicon
@@ -144,7 +142,7 @@ ${favicons_large}: figures/logo.svg | pkgdown/favicon
144142
$(call export-favicon,-51:0:711:760)
145143

146144
${favicon_default}: figures/logo.svg | pkgdown/favicon
147-
${inkscape} -w 180 -h 180 --export-area -51:0:711:760 --export-filename=${@D}/tmp-${@F} $<
145+
inkscape -w 180 -h 180 --export-area -51:0:711:760 --export-filename=${@D}/tmp-${@F} $<
148146
pngcrush -q ${@D}/tmp-${@F} $@ && rm ${@D}/tmp-${@F}
149147

150148
.PHONY: lint

0 commit comments

Comments
 (0)