Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed pandoc to makefile PANDOC variable #106

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changed pandoc to makefile PANDOC variable #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PY=python
PANDOC=pandoc
$(PANDOC)=pandoc

BASEDIR=$(CURDIR)
INPUTDIR=$(BASEDIR)/source
Expand All @@ -25,7 +25,7 @@ help:
@echo 'get local templates with: pandoc -D latex/html/etc'
@echo 'or generic ones from: https://github.com/jgm/pandoc-templates'

ifeq ($(OS),Windows_NT)
ifeq ($(OS),Windows_NT)
detected_OS=Windows
else
detected_OS=$(shell sh -c 'uname 2>/dev/null || echo Unknown')
Expand All @@ -41,7 +41,7 @@ install:
endif

pdf:
pandoc \
$(PANDOC) \
--output "$(OUTPUTDIR)/thesis.pdf" \
--template="$(STYLEDIR)/template.tex" \
--include-in-header="$(STYLEDIR)/preamble.tex" \
Expand All @@ -61,7 +61,7 @@ pdf:
2>pandoc.pdf.log

tex:
pandoc \
$(PANDOC) \
--output "$(OUTPUTDIR)/thesis.tex" \
--template="$(STYLEDIR)/template.tex" \
--include-in-header="$(STYLEDIR)/preamble.tex" \
Expand All @@ -81,7 +81,7 @@ tex:
2>pandoc.tex.log

html:
pandoc \
$(PANDOC) \
--output "$(OUTPUTDIR)/thesis.html" \
--template="$(STYLEDIR)/template.html" \
--include-in-header="$(STYLEDIR)/style.css" \
Expand All @@ -101,7 +101,7 @@ html:
cp -r "$(INPUTDIR)/figures" "$(OUTPUTDIR)/source/figures"

docx:
pandoc \
$(PANDOC) \
--output "$(OUTPUTDIR)/thesis.docx" \
--toc \
"$(INPUTDIR)"/*.md \
Expand Down