aboutsummaryrefslogtreecommitdiff
path: root/tests/docker/Makefile.include
diff options
context:
space:
mode:
Diffstat (limited to 'tests/docker/Makefile.include')
-rw-r--r--tests/docker/Makefile.include9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 2fd2ca3057..f88c0a7309 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -21,15 +21,14 @@ IMAGES ?= %
make-archive-maybe = $(if $(wildcard $1/*), \
$(call quiet-command, \
(cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \
- git archive -1 HEAD --format=tar.gz -o $2; \
+ git archive -1 HEAD --format=tar.gz; \
else \
- git archive -1 $$(git stash create) --format=tar.gz -o $2; \
- fi), \
+ git archive -1 $$(git stash create) --format=tar.gz; \
+ fi) > $2, \
" ARCHIVE $(notdir $2)"))
CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
-# Makes the definition constant after the first expansion
-DOCKER_SRC_COPY = $(eval DOCKER_SRC_COPY := docker-src.$(CUR_TIME))$(DOCKER_SRC_COPY)
+DOCKER_SRC_COPY := docker-src.$(CUR_TIME)
$(DOCKER_SRC_COPY):
@mkdir $@