[Libreoffice-commits] .: librsvg/ExternalProject_librsvg.mk

Sun Oct 14 02:23:00 PDT 2012

librsvg/ExternalProject_librsvg.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f335028a6ba4c2e2ca302a5fc45bfbc8abab0d8d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Oct 14 12:21:50 2012 +0300

    Make sure glib-mkenums is found when there is no system one
    
    Change-Id: Ib2c246d0abba0ffe34d6adcc4d63e8fbacc41b74

diff --git a/librsvg/ExternalProject_librsvg.mk b/librsvg/ExternalProject_librsvg.mk
index f4d658a..6ad34d8 100755
--- a/librsvg/ExternalProject_librsvg.mk
+++ b/librsvg/ExternalProject_librsvg.mk
@@ -30,6 +30,6 @@ $(call gb_ExternalProject_get_state_target,librsvg,build) :
     LIBRSVG_LIBS="-L$(OUTDIR)/lib -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2) -lcairo -lintl" \
 	CFLAGS="-I$(OUTDIR)/inc/external -I$(OUTDIR)/inc/external/glib-2.0 -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 -I$(OUTDIR)/inc/external/pango-1.0 -I$(OUTDIR)/inc/cairo" \
 	LDFLAGS="$(foreach lib,cairo.2 gio-2.0.0 glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 intl.8 pango-1.0.0,-Wl,-dylib_file, at loader_path/lib$(lib).dylib:$(OUTDIR)/lib/lib$(lib).dylib) $(if $(filter YES,$(SYSTEM_LIBXML)),,-Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
-	&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
+	&& PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH $(GNUMAKE) -j$(EXTMAXPROCESS) \
 	&& touch $@
 # vim: set noet sw=4 ts=4:
