summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBapt <bapt@FreeBSD.org>2012-01-23 11:09:39 +0100
committerMiklos Vajna <vmiklos@frugalware.org>2012-01-23 12:08:56 +0100
commitf908fc4ca5bb7ae6d779df4239510fb0a0b84635 (patch)
treec962525f17b6543a5dd43557420a83bd43152b28
parent47c6f602f7874f3bbc48f970a29f3780e8927963 (diff)
use $(GPERF) instead of using gperf from path
-rw-r--r--oox/Library_oox.mk2
-rw-r--r--writerfilter/source/Makefile2
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)