From c273981e3705451bdb3071ed6258b9686d174995 Mon Sep 17 00:00:00 2001
From: Luke Naylor <l.naylor@sms.ed.ac.uk>
Date: Sat, 6 Apr 2024 18:01:04 +0100
Subject: [PATCH] Some fixes to last commit:
Correct PYTHONPATH, correctly link tilt.rs
---
Makefile | 2 +-
latexmkrc | 2 +-
tex/Makefile | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 31463c6..161ded2 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ chapter_deps:
# SYMBOLIC LINKS
tilt.rs:
- ln -s max-destabilizer-rank/tilt.rs/ tilt.rs
+ ln -s subprojects/max-destabilizer-rank/tilt.rs/ tilt.rs
# TEX FILES FROM NOTEBOOKS
diff --git a/latexmkrc b/latexmkrc
index 53b6bae..6e4bd7b 100644
--- a/latexmkrc
+++ b/latexmkrc
@@ -11,4 +11,4 @@ $use_make_for_missing_files = 1;
$do_cd = 1;
$aux_dir = 'aux_files';
$out_dir = '../latex_output';
-$jobname = 'max-destabilizer-rank';
+$jobname = 'Luke-Naylor-Thesis';
diff --git a/tex/Makefile b/tex/Makefile
index de23d08..c56b57e 100644
--- a/tex/Makefile
+++ b/tex/Makefile
@@ -1,10 +1,10 @@
-SAGETEXARTIFACT=main.sagetex.sout
-SAGETEXSCRIPT=main.sagetex.sage # generated by latex compile
-CHAPTERDIRS=$(wildcard ../../subprojects/*)
+SAGETEXARTIFACT=Luke-Naylor-Thesis.sagetex.sout
+SAGETEXSCRIPT=Luke-Naylor-Thesis.sagetex.sage # generated by latex compile
+PYLIBSDIR=$(realpath $(wildcard ../subprojects/*/generated_py_libs))
aux_files/${SAGETEXARTIFACT}: aux_files/${SAGETEXSCRIPT} notebook_py_libs
cd aux_files && \
- PYTHONPATH=`echo $(CHAPTERDIRS) | sed 's/ \+/:/g'` sage ${SAGETEXSCRIPT}
+ PYTHONPATH=`echo ${PYLIBSDIR} | sed 's/ \+/:/g'` sage ${SAGETEXSCRIPT}
notebook_py_libs:
$(MAKE) -C .. pretex
--
GitLab