Skip to content

M
mkimage-profiles
Commit 44675bd0 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

features.in/Makefile: do not run generate.mk, generate.sh when SUBPROFILES=main

When we build the disk with repository, we don't need to generate anything. Attempting to generate it results in an error: make[3]: *** [generate.mk:10: all] Error 1
parent 6443ba46
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
features.in/Makefile
View file @ 44675bd0
...@@ -121,8 +121,10 @@ $(FEATURES): ...@@ -121,8 +121,10 @@ $(FEATURES):
fi; \ fi; \
mp-commit "$(BUILDDIR)/$$dst/" "$$feat feature: $$the part added"; \ mp-commit "$(BUILDDIR)/$$dst/" "$$feat feature: $$the part added"; \
done; \ done; \
if [ -x "generate.sh" ]; then sh generate.sh; fi; \ if [ "$(SUBPROFILES)" != main ]; then \
if [ -s "generate.mk" ]; then $(MAKE) -f generate.mk; fi; \ if [ -x "generate.sh" ]; then sh generate.sh; fi; \
if [ -s "generate.mk" ]; then $(MAKE) -f generate.mk; fi; \
fi; \
mp-commit "$(BUILDDIR)" "$$feat feature generation complete"; \ mp-commit "$(BUILDDIR)" "$$feat feature generation complete"; \
popd >/dev/null popd >/dev/null
......
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