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

[Libreoffice Gerrit user]

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

New commits:
commit 348d2fd87060a3914b1169093ef71d354cc3349c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Oct 5 23:42:44 2012 +0200

    libcdr: fix --with-system-lcms2 build:
    
    It breaks because LCMS2_CFLAGS happens to be empty, which the libcdr
    configure script then complains about, because it thinks it hasn't found
    lcms2.  Work around that by including a space in the variable...
    
    Change-Id: I16cc8278097dc7119d11fdabcc3be5d1ae8b4327

diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 3d4dcec..933ce97 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -36,14 +36,14 @@ else
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	cd $(EXTERNAL_WORKDIR) \
 	&& PKG_CONFIG="" \
-	WPD_CFLAGS="$(WPD_CFLAGS)" \
-	WPD_LIBS="$(WPD_LIBS)" \
-	WPG_CFLAGS="$(WPG_CFLAGS)" \
-	WPG_LIBS="$(WPG_LIBS)" \
-	LCMS2_CFLAGS="$(LCMS2_CFLAGS)" \
-	LCMS2_LIBS="$(LCMS2_LIBS)" \
-	ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \
-	ZLIB_LIBS="$(ZLIB_LIBS)" \
+	WPD_CFLAGS=" $(WPD_CFLAGS)" \
+	WPD_LIBS=" $(WPD_LIBS)" \
+	WPG_CFLAGS=" $(WPG_CFLAGS)" \
+	WPG_LIBS=" $(WPG_LIBS)" \
+	LCMS2_CFLAGS=" $(LCMS2_CFLAGS)" \
+	LCMS2_LIBS=" $(LCMS2_LIBS)" \
+	ZLIB_CFLAGS=" $(ZLIB_CFLAGS)" \
+	ZLIB_LIBS=" $(ZLIB_LIBS)" \
 	./configure \
 		--with-pic \
 		--enable-static \