[Libreoffice-commits] core.git: external/poppler

[Stephan Bergmann]

 external/poppler/ExternalProject_poppler.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2fdf78109e815a64169fdab1a8175b63ef9c64d4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 12 18:49:55 2014 +0100

    Pass MAKE into external/poppler's configure
    
    ...which does some checks about make and could otherwise add some unhelpful
    MAKE=make into its Makefiles if it doesn't find a make (so that the following
    $(MAKE) step would needlessly fail).
    
    Change-Id: Id8d11ffbc5a09c9f7f61fb12acc2481468746404

diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk
index 2663184..5d9c56b 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,poppler,\
 $(call gb_ExternalProject_get_state_target,poppler,build) :
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
-		./configure \
+		MAKE=$(MAKE) ./configure \
 			--with-pic \
 			--enable-static \
 			--disable-shared \