summaryrefslogtreecommitdiff
path: root/redland
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-22 18:02:28 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-22 22:30:20 +0200
commitc03ff5ebc0f008825e45285f7c4021329bd60c05 (patch)
treef47d34d1d7f5f351a273d70b68ce8923aa0eedb1 /redland
parent37563db622eef1bf13fe78b21507fba033586560 (diff)
libxml2, libxslt: use libraries from WORKDIR
Change-Id: I3067e3c819a4918e1d3c91dc0e0cfa3e4fc92b3d
Diffstat (limited to 'redland')
-rw-r--r--redland/ExternalProject_redland.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 927e8f5decd0..fe911bc1bc7e 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -28,7 +28,8 @@ $(call gb_ExternalProject_get_state_target,redland,build):
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
- RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+ RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
./configure --disable-static --disable-gtk-doc \
@@ -50,7 +51,8 @@ $(call gb_ExternalProject_get_state_target,redland,build):
CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
- RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+ RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
./configure --disable-gtk-doc \