[Libreoffice-commits] .: libcdr/ExternalProject_libcdr.mk

[Libreoffice Gerrit user]

 libcdr/ExternalProject_libcdr.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 52a7a8e81a0cc3327de5ee27d02f9320c2cee3e4
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Nov 9 10:40:37 2012 +0100

    fix libcdr with system lcms2
    
    LCMS2_CFLAGS must be non-empty for it to override pkg-config.

diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 01380d3..007f2e0 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -62,8 +62,8 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	WPG_CFLAGS=" $(WPG_CFLAGS)" \
 	WPG_LIBS=" $(WPG_LIBS)" \
 	$(if $(filter YES,$(SYSTEM_LCMS2)),\
-	LCMS2_CFLAGS="$(LCMS2_CFLAGS)" \
-	LCMS2_LIBS="$(LCMS2_LIBS)", \
+	LCMS2_CFLAGS=" $(LCMS2_CFLAGS)" \
+	LCMS2_LIBS=" $(LCMS2_LIBS)", \
 	LCMS2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
 	$(if $(filter MACOSX,$(OS)),-Wno-long-long)" \
 	LCMS2_LIBS="-L$(OUTDIR)/lib -llcms2" ) \