From bbdbda346a73c11772022afd324e24f661b2c4b6 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 12 Aug 2022 18:06:53 -0500 Subject: [PATCH] fix: delete docker conditional --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index afb6ea0..df398eb 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,6 @@ SVGS = $(shell find -type f -wholename "./docs/*.svg") PNGS = $(patsubst ./docs/svg/%.svg,./docs/png/%.png, $(SVGS)) REV := $(shell date +'%Y.%m.%d-' )$(shell git describe --always --dirty | sed s'/dirty/dev/') -ifneq ($(DOCKER),true) - CONVERT := convert -else - CONVERT := docker run --rm -v "$$(pwd)":/imgs dpokidov/imagemagick -endif - .PHONY: all all: @@ -23,7 +17,7 @@ all: pngs: $(PNGS) ./docs/png/%.png: ./docs/svg/%.svg - $(CONVERT) $(if DOCKER=true,/imgs/)$< $(if DOCKER=true,/imgs/)$@ + convert $< -scale 1024 $@ .PHONY: logos ## generate all of the logo svgs @@ -53,6 +47,7 @@ pdm-env: conda-env ## remove old files clean: rm -f *.svg *.png + rm -f docs/*.svg rm -f docs/svg/* rm -f docs/png/*