diff options
| author | Bapt <bapt@FreeBSD.org> | 2012-01-23 11:09:39 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-23 14:16:51 +0100 |
| commit | be423cf84071881c7edf02e713bb769993c48663 (patch) | |
| tree | d9d3fb7e6a24ca1717f5db745134e128d9ca1d65 | |
| parent | 4ad1652522aff11f53edc45bf29531225979935a (diff) | |
use $(GPERF) instead of using gperf from path
(cherry picked from commit f908fc4ca5bb7ae6d779df4239510fb0a0b84635)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | oox/Library_oox.mk | 2 | ||||
| -rw-r--r-- | writerfilter/source/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 098d7472d08a..f513f9bc1870 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -372,7 +372,7 @@ $(eval $(call gb_Library_set_include,oox,\ )) $(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf - gperf --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $@ + $(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $@ oox_GenTarget_get_target = $(oox_MISC)/$(1) diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile index 40f2e25e4987..240893c5aeb4 100644 --- a/writerfilter/source/Makefile +++ b/writerfilter/source/Makefile @@ -143,7 +143,7 @@ $(wf_GEN_ooxml_NamespaceIds_hxx) : $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_oox $(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,GPF,1) $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)) \ - | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@ + | tr -d '\r' | $(GPERF) -I -t -E -S1 -c -G -LC++ > $@ $(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model) $(call gb_Output_announce,$@,build,XSL,1) |