diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-20 13:54:51 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-20 13:54:51 +0100 |
| commit | 8ab70dd31e25228bfb79e111f005698846de3d7a (patch) | |
| tree | 0793e72cf9659c3a74c1a08a845b98cacd44790f /solenv/gbuild/Deliver.mk | |
| parent | 4a83cbf785e1cec44394b7abf91823bd9d245f15 (diff) | |
#i10000# workaround limitations of solaris awk
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 e08966d7e83c..315c9df621f1 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -49,7 +49,7 @@ mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $ endef else define gb_Deliver_deliver -mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=mode,timestamps $(1) $(2) +mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2) endef endif @@ -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))/gb_deliver.log +deliverlog : COMMAND += echo "$$(sort $$(gb_Deliver_DELIVERABLES)) " | $(gb_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 |