From efb0582d899fb3c660773ba5879a38e1b147c258 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Tue, 9 Jun 2020 03:55:11 +0100
Subject: Two minor corrections to avoid warnings in make and make clean

There were two small warnings that are removed with this commit:

 - In the end, when we print the number of words in the PDF, we hadn't
   accounted for the fact that 'paper.pdf' doesn't always exist (for
   example when './project make clean' is run). So a check was added to
   only print the number of words when a PDF exists.

 - I noticed that the '$(texdir)/to-publish' directory was being built both
   in 'initialize.mk' and in 'demo-plot.mk'. So the one in 'demo-plot.mk'
   has been removed.
---
 project                              | 15 ++++++++++-----
 reproduce/analysis/make/demo-plot.mk | 12 ++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/project b/project
index 98166ed..67ccc92 100755
--- a/project
+++ b/project
@@ -411,11 +411,16 @@ EOF
         # Run the actual project.
         controlled_env reproduce/analysis/make/top-make.mk
 
-        # Print the number of words (if the user has pdftotext.
-        if which pdftotext &> /dev/null; then
-          numwords=$(pdftotext paper.pdf && cat paper.txt | wc -w)
-          echo; echo "Number of words in full PDF: $numwords"
-          rm paper.txt
+        # Print the number of words (if the user has pdftotext outside of
+        # Maneage! For now!!!), AND there actually is a 'paper.pdf' (for
+        # example when running './project make clean' there isn't any
+        # 'paper.pdf').
+        if [ -f paper.pdf ]; then
+          if which pdftotext &> /dev/null; then
+            numwords=$(pdftotext paper.pdf && cat paper.txt | wc -w)
+            echo; echo "Number of words in full PDF: $numwords"
+            rm paper.txt
+          fi
         fi
         ;;
 
diff --git a/reproduce/analysis/make/demo-plot.mk b/reproduce/analysis/make/demo-plot.mk
index 5ddb3d7..dc44c4e 100644
--- a/reproduce/analysis/make/demo-plot.mk
+++ b/reproduce/analysis/make/demo-plot.mk
@@ -16,19 +16,11 @@
 
 
 
-# Directory to host outputs
-# -------------------------
-a2dir = $(texdir)/to-publish
-$(a2dir):; mkdir $@
-
-
-
-
 
 # Table for Figure 1C of Menke+20
 # -------------------------------
-a2mk20f1c = $(a2dir)/tools-per-year.txt
-$(a2mk20f1c): $(mk20tab3) | $(a2dir)
+a2mk20f1c = $(tex-publish-dir)/tools-per-year.txt
+$(a2mk20f1c): $(mk20tab3) | $(tex-publish-dir)
 
         # Remove the (possibly) produced figure that is created from this
         # table: it is created by LaTeX's TiKZ package, and includes
-- 
cgit v1.2.1