firmware/shim: correctly handle errors during Xen tree setup

"set -e" on a separate Makefile line is meaningless. Glue together all
the lines that this is supposed to cover.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 53eb3b65439c684fbb147cc7109e29ee4cd98b55..04d3c936ea5f100c91e25555d12344a58d8b574e 100644 (file)
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -16,18 +16,18 @@ DEP_FILES=$(foreach i, $(LINK_FILES), $(XEN_ROOT)/$(i))
 
 linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
        mkdir -p $(D)
-       set -e
        rm -f linkfarm.stamp.tmp
+       set -e; \
        $(foreach d, $(LINK_DIRS), \
                 (mkdir -p $(D)/$(d); \
                  cd $(D)/$(d); \
                  find $(XEN_ROOT)/$(d)/ -type d |\
-                       sed 's,^$(XEN_ROOT)/$(d)/,,g' | xargs mkdir -p);)
+                       sed 's,^$(XEN_ROOT)/$(d)/,,g' | xargs mkdir -p);) \
        $(foreach d, $(LINK_DIRS), \
                (cd $(XEN_ROOT); \
                 find $(d) ! -type l -type f \
                 $(addprefix ! -path , '*.[oda1]' '*.d[12]')) \
-                >> linkfarm.stamp.tmp ; )
+                >> linkfarm.stamp.tmp ; ) \
        $(foreach f, $(LINK_FILES), \
                echo $(f) >> linkfarm.stamp.tmp ;)
        cmp -s linkfarm.stamp.tmp linkfarm.stamp && \