Imported recent work in Maneage, minor conflicts fixed

Some minor conflicts (all expected from the commit messages in the Maneage
branch) occurred but were easily fixed.

1 files changed, 21 insertions, 14 deletions

diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk
index 8af3199..bc73df8 100644
--- a/reproduce/analysis/make/initialize.mk
+++ b/reproduce/analysis/make/initialize.mk
@@ -224,7 +224,7 @@ project-package-contents = $(texdir)/$(project-package-name)
         $(project-package-contents) $(mtexdir)/initialize.tex
 
 texclean:
-	rm *.pdf
+	rm -f *.pdf
 	rm -rf $(texdir)/build/*
 	mkdir $(texdir)/build/tikz # 'tikz' is assumed to already exist.
 
@@ -253,8 +253,7 @@ distclean: clean
         # `rm' program. So for this recipe, we'll use the host system's
         # `rm', not our own.
 	$$sys_rm -rf $(BDIR)
-	$$sys_rm -f $(pconfdir)/LOCAL.conf
-	$$sys_rm -f Makefile .gnuastro .local .build
+	$$sys_rm -f .local .build $(pconfdir)/LOCAL.conf
 
 
 
@@ -367,18 +366,18 @@ $(project-package-contents): paper.pdf | $(texdir)
 	sed -e's|{tikz/}|{tex/tikz/}|' $$pgfsettings > $$pgfsettings.new
 	mv $$pgfsettings.new $$pgfsettings
 
-        # Clean temporary (currently those ending in `~') files.
-	cd $(texdir)
-	find $(project-package-name) -name \*~ -delete
-	find $(project-package-name) -name \*.swp -delete
-
         # PROJECT SPECIFIC
         # ----------------
-        # Put any project specific distribution steps here.
+        # Put any project-specific distribution steps here.
 	cd $$curdir
 	cp tex/build/build/appendix.bbl $$dir/
         # ----------------
 
+        # Clean temporary files that may have been created by text editors.
+	cd $(texdir)
+	find $(project-package-name) -name \*~ -delete
+	find $(project-package-name) -name \*.swp -delete
+
 # Package into `.tar.gz' or '.tar.lz'.
 dist dist-lzip: $(project-package-contents)
 	curdir=$$(pwd)
@@ -460,15 +459,21 @@ $(data-publish-dir):; mkdir $@
 # Print Copyright statement
 # -------------------------
 #
-# This statement can be used in published datasets that are in plain-text
-# format. It assumes you have already put the data-specific statements in
-# its first argument, it will supplement them with general project links.
-doi-prefix-url = https://doi.org
+# The 'print-general-metadata' can be used to print the general metadata in
+# published datasets that are in plain-text format. It should be called
+# with make's 'call' function like this (where 'FILENAME' is the name of
+# the file it will append this content to):
+#
+#    $(call print-general-metadata, FILENAME)
+#
+# See 'reproduce/analysis/make/delete-me.mk' (in the Maneage branch) for a
+# real-world usage of this variable.
+doi-prefix-url   = https://doi.org
 arxiv-prefix-url = https://arxiv.org/abs
 print-general-metadata = \
 	echo "\# Project title: $(metadata-title)" >> $(1); \
 	echo "\# Git commit (that produced this dataset): $(project-commit-hash)" >> $(1); \
-	echo "\# Project's Git repository: $(metadata-git-repository)" >> $(1); \
+	echo "\# Git repository: $(metadata-git-repository)" >> $(1); \
 	if [ x$(metadata-arxiv) != x ]; then \
 	  echo "\# Pre-print: $(arxiv-prefix-url)/abs/$(metadata-arxiv)" >> $(1); fi; \
 	if [ x$(metadata-doi-journal) != x ]; then \
@@ -501,6 +506,8 @@ $(mtexdir)/initialize.tex: | $(mtexdir)
 	echo "\newcommand{\projectdate}{$$d}" > $@
 	echo "\newcommand{\projecttitle}{$(metadata-title)}" >> $@
 	echo "\newcommand{\projectversion}{$(project-commit-hash)}" >> $@
+	echo "\newcommand{\projectgitrepo}{$(metadata-git-repository)}" >> $@
+	echo "\newcommand{\projectcopyrightowner}{$(metadata-copyright-owner)}" >> $@
 
         # arXiv/Zenodo identifier (necessary for download link):
 	echo "\newcommand{\projectarxivid}{$(metadata-arxiv)}" >> $@