[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/Library_oox.mk writerfilter/source

[Michael Stahl]

 oox/Library_oox.mk           |    2 +-
 writerfilter/source/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be423cf84071881c7edf02e713bb769993c48663
Author: Bapt <bapt at FreeBSD.org>
Date:   Mon Jan 23 11:09:39 2012 +0100

    use $(GPERF) instead of using gperf from path
    (cherry picked from commit f908fc4ca5bb7ae6d779df4239510fb0a0b84635)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 098d747..f513f9b 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 40f2e25..240893c 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)