From dc9daf9e5845869156f7f5ee9618a371a30de8a5 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 6 May 2016 14:50:06 -0700 Subject: [PATCH] Makefile: Replace vbatts/pandoc with a PANDOC variable Defaulting to whichever PANDOC is first in your path. This mirrors the existing DOCKER handling. Folks who want to use the old path can run: $ make PANDOC=vbatts/pandoc ... I'm not sure why 4ee036fc (*: printable documents, 2015-12-09, #263) went with a variable for 'docker' but a hard-coded path for 'pandoc'. I expect it was just oversight. Signed-off-by: W. Trevor King --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c80e8dc9..e9de822a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ DOCKER ?= $(shell command -v docker) +PANDOC ?= $(shell command -v pandoc) # These docs are in an order that determines how they show up in the PDF/HTML docs. DOC_FILES := \ version.md \ @@ -32,7 +33,7 @@ output/docs.pdf: $(DOC_FILES) -v $(shell pwd)/:/input/:ro \ -v $(shell pwd)/output/:/output/ \ -u $(shell id -u) \ - vbatts/pandoc -f markdown_github -t latex -o /$@ $(patsubst %,/input/%,$(DOC_FILES)) + $(PANDOC) -f markdown_github -t latex -o /$@ $(patsubst %,/input/%,$(DOC_FILES)) output/docs.html: $(DOC_FILES) mkdir -p output/ && \ @@ -42,7 +43,7 @@ output/docs.html: $(DOC_FILES) -v $(shell pwd)/:/input/:ro \ -v $(shell pwd)/output/:/output/ \ -u $(shell id -u) \ - vbatts/pandoc -f markdown_github -t html5 -o /$@ $(patsubst %,/input/%,$(DOC_FILES)) + $(PANDOC) -f markdown_github -t html5 -o /$@ $(patsubst %,/input/%,$(DOC_FILES)) code-of-conduct.md: curl -o $@ https://raw.githubusercontent.com/opencontainers/tob/d2f9d68c1332870e40693fe077d311e0742bc73d/code-of-conduct.md