Ditch Inkscape.

diff --git a/Makefile b/Makefile
index c6323f521cf4b39657f8601cb26b0677ca611a23..1dee5605457b21d1bb2b3e57e1c9efef415b7d81 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,17 @@ appcache>contents = $(shell grep -vFx -e "*" -e "CACHE MANIFEST" -e "CACHE:" -e
 mlpccg.appcache: $(call appcache>contents,mlpccg.appcache)
        sed -i '' "s/^# Last-Updated: .*$$/# Last-Updated: `date -u +'%Y-%m-%dT%H:%M:%SZ'`/" $@
 
 mlpccg.appcache: $(call appcache>contents,mlpccg.appcache)
        sed -i '' "s/^# Last-Updated: .*$$/# Last-Updated: `date -u +'%Y-%m-%dT%H:%M:%SZ'`/" $@
 

-INKSCAPE := $(firstword $(shell command -v inkscape /Applications/Inkscape.app/Contents/Resources/bin/inkscape) inkscape)
+CONVERT.svg.png ?= rsvg-convert -f png
+CONVERT.png.ico ?= convert

 
 FAVICON_SIZES = 32 57 64 72 76 114 120 144 152 196 256
 FAVICONS = $(patsubst %,favicon_%.png,$(FAVICON_SIZES)) favicon.ico
 
 favicon_%.png: favicon.svg
 
 FAVICON_SIZES = 32 57 64 72 76 114 120 144 152 196 256
 FAVICONS = $(patsubst %,favicon_%.png,$(FAVICON_SIZES)) favicon.ico
 
 favicon_%.png: favicon.svg

-       $(INKSCAPE) -z -e $@ -w $* -h $* $<
+       $(CONVERT.svg.png) -w $* -h $* < $< > $@

 
 %.ico: %_48.png %_32.png %_24.png %_64.png %_16.png
 
 %.ico: %_48.png %_32.png %_24.png %_64.png %_16.png

-       convert $^ $@
+       $(CONVERT.png.ico) $^ $@

 
 all: $(FAVICONS) mlpccg.appcache
 
 
 all: $(FAVICONS) mlpccg.appcache