Commit a028ee77 authored by Michael Shigorin's avatar Michael Shigorin Committed by Anton Midyukov

profile.mk: quote variables properly

...otherwise: $ make QUIET=1 REPORT=1 THE_APT_CONF=branch BRANDING=alt-starterkit ... /bin/sh: line 5: [: too many arguments /bin/sh: line 28: [: too many arguments
parent 3f87222b
...@@ -39,7 +39,7 @@ profile/init: distclean ...@@ -39,7 +39,7 @@ profile/init: distclean
echo "$(TIME) ERROR: invalid BUILDDIR: \`$(BUILDDIR)'"; \ echo "$(TIME) ERROR: invalid BUILDDIR: \`$(BUILDDIR)'"; \
exit 128; \ exit 128; \
fi; \ fi; \
if [ -z $(QUIET) ]; then \ if [ -z "$(QUIET)" ]; then \
echo -n "$(TIME) initializing BUILDDIR: "; \ echo -n "$(TIME) initializing BUILDDIR: "; \
fi; \ fi; \
rsync -qaxH --delete-after image.in/ "$(BUILDDIR)"/; \ rsync -qaxH --delete-after image.in/ "$(BUILDDIR)"/; \
...@@ -75,11 +75,11 @@ profile/init: distclean ...@@ -75,11 +75,11 @@ profile/init: distclean
if [ -w . ]; then \ if [ -w . ]; then \
rm -f "$(SYMLINK)" && \ rm -f "$(SYMLINK)" && \
ln -s "$(BUILDDIR)" "$(SYMLINK)" && \ ln -s "$(BUILDDIR)" "$(SYMLINK)" && \
if [ -z $(QUIET) ]; then \ if [ -z "$(QUIET)" ]; then \
echo "$(SYMLINK)/"; \ echo "$(SYMLINK)/"; \
fi; \ fi; \
else \ else \
if [ -z $(QUIET) ]; then \ if [ -z "$(QUIET)" ]; then \
echo "$(BUILDDIR)/"; \ echo "$(BUILDDIR)/"; \
fi; \ fi; \
fi $(SHORTEN); \ fi $(SHORTEN); \
...@@ -120,7 +120,7 @@ endif ...@@ -120,7 +120,7 @@ endif
# put the derived SUBPROFILE_DIRS here to get it logged in clear text by the way # put the derived SUBPROFILE_DIRS here to get it logged in clear text by the way
profile/finalize: profile/finalize:
@$(call put,SUBPROFILE_DIRS = $$(notdir $$(subst @,/,$$(SUBPROFILES)))) @$(call put,SUBPROFILE_DIRS = $$(notdir $$(subst @,/,$$(SUBPROFILES))))
@if [ -s $(RC) ]; then $(call put,-include $(value RC)); fi @if [ -s "$(RC)" ]; then $(call put,-include $(value RC)); fi
@$(call put,endif) @$(call put,endif)
@mp-commit "$(BUILDDIR)" "image configuration finalized" @mp-commit "$(BUILDDIR)" "image configuration finalized"
......
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