diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-24 18:05:12 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-06 10:29:05 +0100 |
| commit | 66a7815451514121b86dd4b851d4aa74555fd5c8 (patch) | |
| tree | e23c1c1ca1a901aa7b2c347ffee02cb31f2ade63 /solenv | |
| parent | 861c23e9e017a775bdaeb89b487fd732b0ab00c5 (diff) | |
fail if any previous command failed
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 86c1c1db975e..d5a5173cdd6d 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -138,7 +138,7 @@ define gb_Extension_add_file $(call gb_Extension_get_target,$(1)) : FILES += $(2) $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) - mkdir -p $$(dir $$@) + mkdir -p $$(dir $$@) && \ cp -f $$< $$@ endef @@ -165,11 +165,9 @@ endif $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $$(call gb_Output_announce,$(2),$(true),PRP,3) - mkdir -p $$(dir $$@) - cp -f $$< $$@ -ifneq ($(strip $(gb_WITH_LANG)),) - $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2) -endif + mkdir -p $$(dir $$@) && \ + cp -f $$< $$@ \ + $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2)) endef @@ -188,7 +186,7 @@ define gb_Extension_localize_help_onelang $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(gb_Extension_HELPEXTARGET) $(call gb_Output_announce,$(2),$(true),XHP,3) - mkdir -p $$(dir $$@) + mkdir -p $$(dir $$@) && \ $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3) endef |