From af961756090d34139dd1ca81f16d5497bb485f7d Mon Sep 17 00:00:00 2001 From: Tim Hutt Date: Thu, 5 Sep 2024 22:38:15 +0100 Subject: [PATCH] Fix Makefile indentation (#1629) Tabs should only be used for recipes. For `ifeq` and similar you need to use spaces. This is documented here: https://www.gnu.org/software/make/manual/html_node/Conditional-Syntax.html > Extra spaces are allowed and ignored at the beginning of the conditional directive line, but a tab is not allowed. Older versions of Make do not enforce this, but it seems like newer versions do (I'm using one built from source some time after 4.4.1). --- Makefile | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index e3a25d71..29ab6e5e 100644 --- a/Makefile +++ b/Makefile @@ -24,32 +24,32 @@ DOCS := riscv-privileged riscv-unprivileged DATE ?= $(shell date +%Y-%m-%d) DOCKER_IMG := riscvintl/riscv-docs-base-container-image:latest ifneq ($(SKIP_DOCKER),true) - DOCKER_IS_PODMAN = \ - $(shell ! docker -v 2>&1 | grep podman >/dev/null ; echo $$?) - ifeq "$(DOCKER_IS_PODMAN)" "1" - DOCKER_VOL_SUFFIX = :z - endif - - DOCKER_CMD = \ - docker run --rm \ - -v ${PWD}/$@.workdir:/build${DOCKER_VOL_SUFFIX} \ - -w /build \ - ${DOCKER_IMG} \ - /bin/sh -c - DOCKER_QUOTE := " + DOCKER_IS_PODMAN = \ + $(shell ! docker -v 2>&1 | grep podman >/dev/null ; echo $$?) + ifeq "$(DOCKER_IS_PODMAN)" "1" + DOCKER_VOL_SUFFIX = :z + endif + + DOCKER_CMD = \ + docker run --rm \ + -v ${PWD}/$@.workdir:/build${DOCKER_VOL_SUFFIX} \ + -w /build \ + ${DOCKER_IMG} \ + /bin/sh -c + DOCKER_QUOTE := " else - DOCKER_CMD = \ - cd $@.workdir && + DOCKER_CMD = \ + cd $@.workdir && endif WORKDIR_SETUP = \ - rm -rf $@.workdir && \ - mkdir -p $@.workdir && \ - cp -r src docs-resources $@.workdir + rm -rf $@.workdir && \ + mkdir -p $@.workdir && \ + cp -r src docs-resources $@.workdir WORKDIR_TEARDOWN = \ - mv $@.workdir/$@ $@ && \ - rm -rf $@.workdir + mv $@.workdir/$@ $@ && \ + rm -rf $@.workdir SRC_DIR := src BUILD_DIR := build