[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libgltf

[Jan-Marek Glogowski]

 external/libgltf/ExternalProject_libgltf.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8980637bfb843016473fad5cb9dce0a6ca1297b1
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Aug 6 13:16:55 2014 +0200

    Fix libgltf dbgutil build
    
    The simpler version of the master fix
      commit 1f23cc159de5e8584b9354a42d431356530d1ce0
    
    This just changes the environment visibility of CPPFLAGS by
    exporting it, so $(MAKE) and configure actually see it.
    
    Change-Id: I6d508cbfbee26cdb3062f0628ee8151be4f11881
    Reviewed-on: https://gerrit.libreoffice.org/10788
    Reviewed-by: Zolnai Tamás <tamas.zolnai at collabora.com>
    Tested-by: Zolnai Tamás <tamas.zolnai at collabora.com>

diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 8c8878d..548487b 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -60,8 +60,8 @@ endif
 
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
 	$(call gb_ExternalProject_run,build,\
-		CPPFLAGS='$(libgltf_CPPFLAGS)' \
-		export PKG_CONFIG="" \
+		export CPPFLAGS='$(libgltf_CPPFLAGS)' \
+		&& export PKG_CONFIG="" \
 		&& ./configure \
 			--with-pic \
 			--disable-debug \