jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile: filename docs.* -> oci-runtime-spec.* 

When this repo was only 'specs', then the generic name was not so bad.
But now there is also the oci-image-spec, so this lines up it's unique
name as well.

This also variablizes the output filename so it will be easier for
release specific names.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Vincent Batts 2016-06-01 13:26:54 -04:00
parent 3b166cd0c2
commit f656de6a56
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -1,4 +1,7 @@
EPOCH_TEST_COMMIT := 78e6667ae2d67aad100b28ee9580b41b7a24e667
OUTPUT_DIRNAME ?= output/
DOC_FILENAME ?= oci-runtime-spec
SHELL ?= $(shell command -v bash 2>/dev/null) SHELL ?= $(shell command -v bash 2>/dev/null)
DOCKER ?= $(shell command -v docker 2>/dev/null) DOCKER ?= $(shell command -v docker 2>/dev/null)
PANDOC ?= $(shell command -v pandoc 2>/dev/null) PANDOC ?= $(shell command -v pandoc 2>/dev/null)
@ -8,7 +11,7 @@ ifeq "$(strip $(PANDOC))" ''
-it \ -it \
--rm \ --rm \
-v $(shell pwd)/:/input/:ro \ -v $(shell pwd)/:/input/:ro \
-v $(shell pwd)/output/:/output/ \ -v $(shell pwd)/$(OUTPUT_DIRNAME)/:/$(OUTPUT_DIRNAME)/ \
-u $(shell id -u) \ -u $(shell id -u) \
vbatts/pandoc vbatts/pandoc
PANDOC_SRC := /input/ PANDOC_SRC := /input/
@ -33,23 +36,22 @@ DOC_FILES := \
config-linux.md \ config-linux.md \
config-solaris.md \ config-solaris.md \
glossary.md glossary.md
EPOCH_TEST_COMMIT := 78e6667ae2d67aad100b28ee9580b41b7a24e667
default: docs default: docs
.PHONY: docs .PHONY: docs
docs: output/docs.pdf output/docs.html docs: $(OUTPUT_DIRNAME)/$(DOC_FILENAME).pdf $(OUTPUT_DIRNAME)/$(DOC_FILENAME).html
ifeq "$(strip $(PANDOC))" '' ifeq "$(strip $(PANDOC))" ''
output/docs.pdf output/docs.html: $(OUTPUT_DIRNAME)/$(DOC_FILENAME).pdf $(OUTPUT_DIRNAME)/$(DOC_FILENAME).html:
$(error cannot build $@ without either pandoc or docker) $(error cannot build $@ without either pandoc or docker)
else else
output/docs.pdf: $(DOC_FILES) $(OUTPUT_DIRNAME)/$(DOC_FILENAME).pdf: $(DOC_FILES)
mkdir -p output/ && \ mkdir -p $(OUTPUT_DIRNAME)/ && \
$(PANDOC) -f markdown_github -t latex -o $(PANDOC_DST)$@ $(patsubst %,$(PANDOC_SRC)%,$(DOC_FILES)) $(PANDOC) -f markdown_github -t latex -o $(PANDOC_DST)$@ $(patsubst %,$(PANDOC_SRC)%,$(DOC_FILES))
output/docs.html: $(DOC_FILES) $(OUTPUT_DIRNAME)/$(DOC_FILENAME).html: $(DOC_FILES)
mkdir -p output/ && \ mkdir -p $(OUTPUT_DIRNAME)/ && \
$(PANDOC) -f markdown_github -t html5 -o $(PANDOC_DST)$@ $(patsubst %,$(PANDOC_SRC)%,$(DOC_FILES)) $(PANDOC) -f markdown_github -t html5 -o $(PANDOC_DST)$@ $(patsubst %,$(PANDOC_SRC)%,$(DOC_FILES))
endif endif
@ -111,5 +113,5 @@ endif
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf output/ *~ rm -rf $(OUTPUT_DIRNAME) *~