diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-12-20 09:26:43 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-01-10 21:35:28 -0600 |
| commit | 20dc76ba46ea7a7e70fc78e0b324de5e04f65b52 (patch) | |
| tree | ba870fb60b0ccb7a6905bb56e82a57fbae11b2ba /solenv/gbuild/Deliver.mk | |
| parent | 621c7add3ea09c84bff51c3c5d6117582c012de3 (diff) | |
rename deliver.log to gb_deliver.log to save it from being killed by deliver
Diffstat (limited to 'solenv/gbuild/Deliver.mk')
| -rw-r--r-- | solenv/gbuild/Deliver.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 5fb000fd1a67..acacd18aaa24 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -46,7 +46,7 @@ endef # FIXME: this does not really work for real multi repository builds, but the # deliver.log format is broken in that case anyway define gb_Deliver_add_deliverable -gb_Deliver_DELIVERABLES += $$(patsubst $(SOURCE_ROOT_DIR)/%,%,$(2)):$$(patsubst $(SOURCE_ROOT_DIR)/%,%,$(1)) +gb_Deliver_DELIVERABLES += $$(patsubst $(REPO_DIR)/%,%,$(2)):$$(patsubst $(REPO_DIR)/%,%,$(1)) endef @@ -63,7 +63,7 @@ define gb_Deliver_setdeliverlogcommand ifeq ($$(words $(gb_Module_ALLMODULES)),1) $$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1)) deliverlog : COMMAND := mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) && -deliverlog : COMMAND += echo "$$(sort $$(gb_Deliver_DELIVERABLES)) " | awk -f $$(GBUILDDIR)/processdelivered.awk > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/deliver.log +deliverlog : COMMAND += echo "$$(sort $$(gb_Deliver_DELIVERABLES)) " | awk -f $$(GBUILDDIR)/processdelivered.awk > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log else $$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1)) deliverlog : COMMAND := true |