From c87041918d7e21d27f711ef151b995d33ee7d468 Mon Sep 17 00:00:00 2001 From: Wookey <wookey@wookware.org> Date: Tue, 24 May 2016 13:23:50 +0100 Subject: [PATCH] Fix Makefile so it can work on Linux as well as windows (define var for pdflatex binary name). Fix whitespace formatting errors (it matters for make). --- documents/bierbook/Makefile | 55 ++++++++++++++++++++---------------- documents/bierbook/dates.txt | 2 +- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/documents/bierbook/Makefile b/documents/bierbook/Makefile index 7fdf03feb..3ccc22926 100644 --- a/documents/bierbook/Makefile +++ b/documents/bierbook/Makefile @@ -1,25 +1,30 @@ -all: bierbook.pdf seshbook.pdf - -bierbook.pdf: bierbook.tex names.txt dates.txt bierbook-style.sty - pdflatex.exe -synctex=1 -interaction=nonstopmode -shell-escape bierbook.tex - pdflatex.exe -synctex=1 -interaction=nonstopmode -shell-escape bierbook.tex - pdflatex.exe -synctex=1 -interaction=nonstopmode -shell-escape bierbook.tex - -seshbook.pdf: seshbook.tex names.txt bierbook-style.sty - pdflatex.exe -synctex=1 -interaction=nonstopmode -shell-escape seshbook.tex - pdflatex.exe -synctex=1 -interaction=nonstopmode -shell-escape seshbook.tex - -cleanbier: - rm -f bierbook.aux - rm -f bierbook.log - rm -f bierbook.pdf - rm -f bierbook.synctex.gz - rm -f bierbook.toc - -cleansesh: - rm -f seshbook.aux - rm -f seshbook.log - rm -f seshbook.pdf - rm -f seshbook.synctex.gz - -clean: cleanbier cleansesh \ No newline at end of file +all: bierbook.pdf seshbook.pdf + +#If using windows uncomment this +LATEXTOOL=pdflatex.exe +#If using linux or macos(?) uncomment this +#LATEXTOOL=pdflatex + +bierbook.pdf: bierbook.tex names.txt dates.txt bierbook-style.sty + $(LATEXTOOL) -synctex=1 -interaction=nonstopmode -shell-escape bierbook.tex + $(LATEXTOOL) -synctex=1 -interaction=nonstopmode -shell-escape bierbook.tex + $(LATEXTOOL) -synctex=1 -interaction=nonstopmode -shell-escape bierbook.tex + +seshbook.pdf: seshbook.tex names.txt bierbook-style.sty + $(LATEXTOOL) -synctex=1 -interaction=nonstopmode -shell-escape seshbook.tex + $(LATEXTOOL) -synctex=1 -interaction=nonstopmode -shell-escape seshbook.tex + +cleanbier: + rm -f bierbook.aux + rm -f bierbook.log + rm -f bierbook.pdf + rm -f bierbook.synctex.gz + rm -f bierbook.toc + +cleansesh: + rm -f seshbook.aux + rm -f seshbook.log + rm -f seshbook.pdf + rm -f seshbook.synctex.gz + +clean: cleanbier cleansesh diff --git a/documents/bierbook/dates.txt b/documents/bierbook/dates.txt index 18fbfef07..ffde6903b 100644 --- a/documents/bierbook/dates.txt +++ b/documents/bierbook/dates.txt @@ -3,4 +3,4 @@ 3 Jul - 9 Jul 10 Jul - 16 Jul 17 Jul - 23 Jul -24 Jul - 31 Jul \ No newline at end of file +24 Jul - 31 Jul