diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-09 23:15:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-10 10:47:44 +0200 |
| commit | a9550f63cd7a7e064901b2c997375ed384781eea (patch) | |
| tree | b35a7bf6077c5b40390cbde11dffe30ef90d57c9 /desktop/CustomTarget_soffice.mk | |
| parent | error handling in SortTree custom action (diff) | |
| download | core-a9550f63cd7a7e064901b2c997375ed384781eea.tar.gz core-a9550f63cd7a7e064901b2c997375ed384781eea.zip | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'desktop/CustomTarget_soffice.mk')
| -rw-r--r-- | desktop/CustomTarget_soffice.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index 8d49935f6a38..74eb6c9d6e3c 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/desktop/CustomTarget_soffice.mk @@ -27,11 +27,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice)) -DESO := $(call gb_CustomTarget_get_workdir,desktop/soffice) +$(call gb_CustomTarget_get_target,desktop/soffice) : \ + $(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh -$(call gb_CustomTarget_get_target,desktop/soffice) : $(DESO)/soffice.sh - -$(DESO)/soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh | $(DESO)/.dir +$(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh : \ + $(SRCDIR)/desktop/scripts/soffice.sh \ + | $(call gb_CustomTarget_get_workdir,desktop/soffice)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) ifneq ($(JITC_PROCESSOR_TYPE),) sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@ |