Skip to content

M
mkimage-profiles
Commit 7b4f9e4d authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

build.mk: Do nothing with IMAGEDIR if $(DIRECT_TARGETS) is running

parent 8fdafec8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
lib/build.mk
View file @ 7b4f9e4d
...@@ -47,6 +47,7 @@ endif ...@@ -47,6 +47,7 @@ endif
# to be passed into distcfg.mk; suggestions are welcome # to be passed into distcfg.mk; suggestions are welcome
ifneq (,$(filter-out $(DIRECT_TARGETS),$(MAKECMDGOALS)))
IMAGEDIR ?= $(shell \ IMAGEDIR ?= $(shell \
if [ -d "$$HOME/out" -a -w "$$HOME/out" ]; then \ if [ -d "$$HOME/out" -a -w "$$HOME/out" ]; then \
echo "$$HOME/out"; \ echo "$$HOME/out"; \
...@@ -55,6 +56,7 @@ IMAGEDIR ?= $(shell \ ...@@ -55,6 +56,7 @@ IMAGEDIR ?= $(shell \
mkdir -p "$$dir" && echo "$$dir" || echo "/tmp"; \ mkdir -p "$$dir" && echo "$$dir" || echo "/tmp"; \
fi; \ fi; \
) )
endif
LOGDIR ?= $(wildcard $(IMAGEDIR)) LOGDIR ?= $(wildcard $(IMAGEDIR))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment