WIP: make man: make it work when cowsay.1 is absent; factor out tmp…

…dir deletion

Makefile

@@ -78,21 +78,20 @@ man/man1/cowsay.1: man-src/man1/cowsay.1.adoc man-src/normalize-manpage.sed
 	if ! test -d build; then mkdir build; fi; \
 	tmpdir="build/tmp$$$$"; \
 	if $(ASCIIDOCTOR) -b manpage -D "$$tmpdir/man/man1" man-src/man1/cowsay.1.adoc; then \
-	  sed -f man-src/normalize-manpage.sed man/man1/cowsay.1 > "$$tmpdir/man/man1/normalized-old-cowsay.1"; \
-	  sed -f man-src/normalize-manpage.sed "$$tmpdir/man/man1/cowsay.1" > "$$tmpdir/man/man1/normalized-new-cowsay.1"; \
-	  if ! test -e "man/man1/cowsay.1" || ! cmp "$$tmpdir/man/man1/normalized-old-cowsay.1" "$$tmpdir/man/man1/normalized-new-cowsay.1" > /dev/null; then \
-	    echo "Updating man/man1/cowsay.1"; \
-	    mv -f "$$tmpdir/man/man1/cowsay.1" man/man1/cowsay.1; \
-	    rm -f "$$tmpdir/man/man1/normalized-old-cowsay.1"; \
-	    rm -f "$$tmpdir/man/man1/normalized-new-cowsay.1"; \
-	    rm -f "$$tmpdir/man/man1/cowthink.1"; \
-	    rmdir "$$tmpdir/man/man1"; \
-	    rmdir "$$tmpdir/man"; \
-	    rmdir "$$tmpdir"; \
+	  if test -f man/man1/cowsay.1; then \
+	    sed -f man-src/normalize-manpage.sed man/man1/cowsay.1 > "$$tmpdir/man/man1/normalized-old-cowsay.1"; \
+	    sed -f man-src/normalize-manpage.sed "$$tmpdir/man/man1/cowsay.1" > "$$tmpdir/man/man1/normalized-new-cowsay.1"; \
+	    if ! test -e "man/man1/cowsay.1" || ! cmp "$$tmpdir/man/man1/normalized-old-cowsay.1" "$$tmpdir/man/man1/normalized-new-cowsay.1" > /dev/null; then \
+	      echo "Updating man/man1/cowsay.1"; \
+	      mv -f "$$tmpdir/man/man1/cowsay.1" man/man1/cowsay.1; \
+	    else \
+	      echo "man/man1/cowsay.1 is up to date"; \
+	    fi; \
 	  else \
-	    echo "man/man1/cowsay.1 is up to date"; \
-	    rm -rf "$$tmpdir"; \
+	    echo "Regenerating man/man1/cowsay.1"; \
+		mv -f "$$tmpdir/man/man1/cowsay.1" man/man1/cowsay.1; \
 	  fi; \
+	  rm -rf "$$tmpdir"; \
 	else \
 	  echo "Error updating man/man1/cowsay.1"; \
 	  exit 1; \