Skip to content

Makefile: Replace vbatts/pandoc with a PANDOC variable #428

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

Merged
vbatts merged 2 commits into from
May 7, 2016
Merged

Makefile: Replace vbatts/pandoc with a PANDOC variable #428

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ac46cb
Makefile: Use 'command -v' instead of 'which'
wking May 6, 2016
dc9daf9
Makefile: Replace vbatts/pandoc with a PANDOC variable
wking May 6, 2016
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
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

DOCKER ?= $(shell which docker)
DOCKER ?= $(shell command -v docker)
Copy link
Member

@vbatts vbatts May 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose this is fine.

Copy link
Contributor

@hqhq hqhq May 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wking It looks like it should work fine, but I got error make: command: Command not found, I have to change it back to which, any insight on this? Maybe related to bash version?

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 \
Expand Down Expand Up @@ -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))
Copy link
Contributor

@laijs laijs May 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just curious before any test or investigation, $(PANDOC) is a path to the pandoc executive when default, but we expect pandoc image here, how this replacement works?

Copy link
Contributor Author

@wking wking May 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Thu, May 19, 2016 at 08:40:21PM -0700, Lai Jiangshan wrote:

  • vbatts/pandoc -f markdown_github -t latex -o /$@ $(patsubst %,/input/%,$(DOC_FILES))
  • $(PANDOC) -f markdown_github -t latex -o /$@ $(patsubst %,/input/%,$(DOC_FILES))

I'm just curious before any test or investigation, $(PANDOC) is a
path to the pandoc executive when default, but we expect
pandoc image here, how this replacement works?

Oops, I had missed this. See #440 for some paths forward.


output/docs.html: $(DOC_FILES)
mkdir -p output/ && \
Expand All @@ -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
Expand Down