diff options
author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-02 15:51:28 +0100 |
---|---|---|
committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-02 16:05:03 +0100 |
commit | de3842a14e36b2debb3ad375d95411d15d45dc84 (patch) | |
tree | 86ae571f85c639c616cf8939cbcec7f1c1be4c9c /reproduce/analysis/make/top-make.mk | |
parent | 646756675566a0907edf143c6b6950e0479d9e7e (diff) | |
parent | cbf177e09af6b9d240388d148b0cb5e3488d8b09 (diff) |
Imported recent work on Maneage, minor conflicts fixed
A few minor conflicts occurred and were fixed.
Diffstat (limited to 'reproduce/analysis/make/top-make.mk')
-rw-r--r-- | reproduce/analysis/make/top-make.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/reproduce/analysis/make/top-make.mk b/reproduce/analysis/make/top-make.mk index 000c1fd..30d537a 100644 --- a/reproduce/analysis/make/top-make.mk +++ b/reproduce/analysis/make/top-make.mk @@ -21,7 +21,7 @@ # Load the local configuration (created after running # `./project configure'). -include reproduce/software/config/installation/LOCAL.mk +include reproduce/software/config/installation/LOCAL.conf @@ -50,7 +50,7 @@ include reproduce/software/config/installation/LOCAL.mk # # Controlling this requires two variables that are available at this stage: # -# - `GROUP-NAME': from `LOCAL.mk' (which was built by `./project configure'). +# - `GROUP-NAME': from `LOCAL.conf' (which was built by `./project configure'). # - `reproducible_paper_group_name': value to the `--group' option. # # The analysis is only done when both have the same group name. Note that @@ -63,7 +63,7 @@ include reproduce/software/config/installation/LOCAL.mk # # If you are just interested in the processing and don't want to build the # PDF, you can skip the creatation of the final PDF by removing the value -# of `pdf-build-final' in `reproduce/analysis/config/pdf-build.mk'. +# of `pdf-build-final' in `reproduce/analysis/config/pdf-build.conf'. ifeq (x$(reproducible_paper_group_name),x$(GROUP-NAME)) all: paper.pdf else |