appendix.bbl is now included in make dist tarball

Since the addition of the appendix bibliography we hadn't checked the 'make
dist' command, as a result the PDF couldn't be built. With this commit, in
the 'dist' rule, we are now also copying 'appendix.bbl' and the created
tarball could build the PDF properly. Also the 'peer-review' directory is
now also included in the tarball created by './project make dist'.

I also found a small typo in the description of Occam (an 'a' was missing)
and fixed it.

2 files changed, 8 insertions, 5 deletions

diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk
index 4bae0a4..8f1769e 100644
--- a/reproduce/analysis/make/initialize.mk
+++ b/reproduce/analysis/make/initialize.mk
@@ -264,18 +264,19 @@ $(project-package-contents): paper.pdf | $(texdir)
 	dir=$@
 	rm -rf $$dir
 	mkdir $$dir
+	curdir=$$(pwd)
 
         # Build a small Makefile to help in automatizing the paper building
         # (including the bibliography).
 	m=$$dir/Makefile
 	echo   "paper.pdf: paper.tex paper.bbl"                   > $$m
 	printf "\tlatex -shell-escape -halt-on-error paper\n"    >> $$m
+	printf "\tlatex -shell-escape -halt-on-error paper\n"    >> $$m
 	printf "\tdvips paper.dvi\n"                             >> $$m
 	printf "\tps2pdf -dNOSAFER paper.ps\n"                   >> $$m
 	echo   "paper.bbl: tex/src/references.tex"               >> $$m
 	printf "\tlatex -shell-escape -halt-on-error paper\n"    >> $$m
 	printf "\tbibtex paper\n"                                >> $$m
-	printf "\tlatex -shell-escape -halt-on-error paper\n"    >> $$m
 	echo   ".PHONY: clean"                                   >> $$m
 	echo   "clean:"                                          >> $$m
 	printf "\trm -f *.aux *.auxlock *.bbl *.bcf\n"           >> $$m
@@ -302,7 +303,7 @@ $(project-package-contents): paper.pdf | $(texdir)
         # with Tar, piping it, and unpacking it in the archive
         # directory. So afterwards we need to come back to the current
         # directory.
-	tar -c -f - $$(git ls-files reproduce tex/src) \
+	tar -c -f - $$(git ls-files peer-review reproduce tex/src) \
 	    | (cd $$dir ; tar -x -f -)
 	cd $(curdir)
 
@@ -345,8 +346,8 @@ $(project-package-contents): paper.pdf | $(texdir)
         # that may cause problems on the arXiv server.
 	cp tex/build/build/paper.bbl $$dir/
 	tltopdir=.local/texlive/maneage/texmf-dist/tex/latex
-	#find $$tltopdir/biblatex/ -maxdepth 1 -type f -print0 \
-	#     | xargs -0 cp -t $$dir
+        #find $$tltopdir/biblatex/ -maxdepth 1 -type f -print0 \
+        #     | xargs -0 cp -t $$dir
 
         # Just in case the package users want to rebuild some of the
         # figures (manually un-comment the `makepdf' command we commented
@@ -364,6 +365,8 @@ $(project-package-contents): paper.pdf | $(texdir)
         # PROJECT SPECIFIC
         # ----------------
         # Put any project specific distribution steps here.
+	cd $$curdir
+	cp tex/build/build/appendix.bbl $$dir/
         # ----------------
 
 # Package into `.tar.gz' or '.tar.lz'.
diff --git a/tex/src/appendix-existing-solutions.tex b/tex/src/appendix-existing-solutions.tex
index d149c77..aa6809f 100644
--- a/tex/src/appendix-existing-solutions.tex
+++ b/tex/src/appendix-existing-solutions.tex
@@ -510,7 +510,7 @@ This issue with Whole Tale (and generally all other solutions that only rely on
 
 \subsection{Occam (2018)}
 \label{appendix:occam}
-Occam\footnote{\inlinecode{\url{https://occam.cs.pitt.edu}}} \citeappendix{oliveira18} is web-based application to preserve software and its execution.
+Occam\footnote{\inlinecode{\url{https://occam.cs.pitt.edu}}} \citeappendix{oliveira18} is a web-based application to preserve software and its execution.
 To achieve long-term reproducibility, Occam includes its own package manager (instructions to build software and their dependencies) to be in full control of the software build instructions, similar to Maneage.
 Besides Nix or Guix (which are primarily a package manager that can also do job management), Occam has been the only solution in our survey here that attempts to be complete in this aspect.