aboutsummaryrefslogtreecommitdiff
path: root/reproduce/src/make
diff options
context:
space:
mode:
Diffstat (limited to 'reproduce/src/make')
-rw-r--r--reproduce/src/make/initialize.mk11
-rw-r--r--reproduce/src/make/paper.mk6
2 files changed, 12 insertions, 5 deletions
diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk
index 5fd87c9..c5f8620 100644
--- a/reproduce/src/make/initialize.mk
+++ b/reproduce/src/make/initialize.mk
@@ -53,7 +53,8 @@ pconfdir = reproduce/config/pipeline
# Before defining the local sub-environment here, we'll need to save the
# system's environment for some scenarios (for example after `clean'ing the
# built programs).
-sys-rm := $(shell which rm)
+sys-path := $(PATH)
+sys-rm := $(shell which rm)
@@ -70,11 +71,11 @@ sys-rm := $(shell which rm)
# build here.
.ONESHELL:
.SHELLFLAGS = -ec
+LD_LIBRARY_PATH := .local/lib
+PATH := .local/bin
+LDFLAGS := -L.local/lib
SHELL := .local/bin/bash
-PATH := .local/bin:$(PATH)
-LDFLAGS := -L.local/lib $(LDFLAGS)
-CPPFLAGS := -I.local/include $(CPPFLAGS)
-LD_LIBRARY_PATH := .local/lib:$(LD_LIBRARY_PATH)
+CPPFLAGS := -I.local/include
diff --git a/reproduce/src/make/paper.mk b/reproduce/src/make/paper.mk
index 79d7722..eaa1948 100644
--- a/reproduce/src/make/paper.mk
+++ b/reproduce/src/make/paper.mk
@@ -38,6 +38,9 @@
$(texbdir)/paper.bbl: tex/references.tex \
| $(tikzdir) $(texbdir) tex/pipeline.tex
+ # To find LaTeX (which currently isn't internally installed).
+ PATH=$(sys-path)
+
# We'll run LaTeX first to generate the `.bcf' file (necessary for
# `biber') and then run `biber' to generate the `.bbl' file.
p=$$(pwd);
@@ -61,6 +64,9 @@ $(texbdir)/paper.bbl: tex/references.tex \
paper.pdf: tex/pipeline.tex paper.tex $(texbdir)/paper.bbl \
| $(tikzdir) $(texbdir)
+ # To find LaTeX (which currently isn't internally installed).
+ PATH=$(sys-path)
+
# Go into the top TeX build directory and make the paper.
p=$$(pwd)
export TEXINPUTS=$$p:$$TEXINPUTS