From acabe10e30ddef3080ed5c40dd09fe2536a23593 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Wed, 25 Sep 2019 23:16:59 -0700 Subject: [PATCH] Unique filename when thumbnailing starters Helps for parallel builds (e.g., `make -j12`). h/t Pere. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c246b61eb..9d833f16b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - September 14, 2019 +# June 14, 2002 - September 25, 2019 # The version number, for release: @@ -709,9 +709,9 @@ $(THUMB_STARTERS): @mkdir -p starters/.thumbs @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ then \ - composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp.png ; \ - convert $(CONVERT_OPTS) obj/tmp.png $@ ; \ - rm obj/tmp.png ; \ + composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ + convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \ + rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ else \ convert $(CONVERT_OPTS) $(STARTER_NAME) $@ ; \ fi