Makefile: Fix native pandoc invocation #448
Conversation
Don't spam people with: make: command: Command not found Signed-off-by: W. Trevor King <wking@tremily.us>
In dc9daf9 (Makefile: Replace vbatts/pandoc with a PANDOC variable 2016-05-06, opencontainers#428) I'd misunderstood vbatts/pandoc as a call to a locally-installed pandoc, when it's actually the name of a Docker image [1,2]. With this commit, we prefer a local pandoc if one exists, fall back to Docker and vbatts/pandoc if a local 'docker' exists, and raise an error if neither 'pandoc' nor 'docker' exist. [1]: opencontainers#440 [2]: opencontainers#428 (comment) Reported-by: Qiang Huang <h.huangqiang@huawei.com> Reported-by: Lai Jiangshan <jiangshanlai@gmail.com> Signed-off-by: W. Trevor King <wking@tremily.us>
| -v $(shell pwd)/output/:/output/ \ | ||
| -u $(shell id -u) \ | ||
| $(PANDOC) -f markdown_github -t latex -o /$@ $(patsubst %,/input/%,$(DOC_FILES)) | ||
| $(PANDOC) -f markdown_github -t latex -o $(PANDOC_DST)$@ $(patsubst %,$(PANDOC_SRC)%,$(DOC_FILES)) |
There was a problem hiding this comment.
If we have local pandoc, should also set PANDOC_DST and PANDOC_SRC, otherwise they'll be empty.
There was a problem hiding this comment.
Empty strings are the values we want for a native pandoc, but I can explicitly set them to empty strings if you like. Let me know if that's what you want.
|
Fixes #454 |
|
LGTM |
|
I think the default should be vbatts/pandoc. |
|
@laijs oh good point. I merged it because it's presently broken. Though for consistency sake that is a good point. |
|
On Wed, May 25, 2016 at 05:19:53AM -0700, Lai Jiangshan wrote:
Unless we specify a specific version of vbatts/pandoc, I don't see how |
4 participants
In #428 I'd misunderstood vbatts/pandoc as a call to a locally-installed pandoc, when it's actually the name of a Docker image. With this series, we prefer a local pandoc if one exists, fall back to Docker and vbatts/pandoc if a local
dockerexists, and raise an error if neitherpandocnordockerexist.This is an alternative to #440, which reverts dc9daf9 and doesn't allow for a locally-installed pandoc.