From cbe01ab6569e3c96db8af67d91d2b463b61aaad1 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 18 Dec 2018 15:49:00 -0500 Subject: [PATCH] Makefile: variable cleanup and creation Signed-off-by: Vincent Batts --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a8d5fd39b..64a8c84d0 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,10 @@ export GO15VENDOREXPERIMENT DOCKER ?= $(shell command -v docker 2>/dev/null) PANDOC ?= $(shell command -v pandoc 2>/dev/null) +OUTPUT_DIRNAME ?= output/ +DOC_FILENAME ?= oci-image-spec + +PANDOC_CONTAINER ?= docker.io/vbatts/pandoc:1.17.0.3-2.fc25.x86_64 ifeq "$(strip $(PANDOC))" '' ifneq "$(strip $(DOCKER))" '' PANDOC = $(DOCKER) run \ @@ -13,7 +17,7 @@ ifeq "$(strip $(PANDOC))" '' -v $(shell pwd)/$(OUTPUT_DIRNAME)/:/$(OUTPUT_DIRNAME)/ \ -u $(shell id -u) \ --workdir /input \ - docker.io/vbatts/pandoc:1.17.0.3-2.fc25.x86_64 + $(PANDOC_CONTAINER) PANDOC_SRC := /input/ PANDOC_DST := / endif @@ -37,9 +41,6 @@ DOC_FILES := \ FIGURE_FILES := \ img/media-types.png -OUTPUT_DIRNAME ?= output/ -DOC_FILENAME ?= oci-image-spec - EPOCH_TEST_COMMIT ?= v0.2.0 TOOLS := esc gitvalidation glide glide-vc