summaryrefslogtreecommitdiff
path: root/redland
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-01-20 10:06:44 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-01-20 10:06:44 +0000
commit4b723a6a5dcff166a2e89d54563406ca916d242f (patch)
treefb696c9a546bf2ba3eaded4f527d015a9afb57ff /redland
parent50e8c911e060d2ecdada42823f90be30296c0508 (diff)
CWS-TOOLING: integrate CWS cloph12
2009-01-13 18:36:51 +0100 cloph r266245 : #i98008# add back the XSLTLIB exports - used when using the internal libxslt (patched xslt-config that uses that var) 2009-01-13 01:51:56 +0100 cloph r266186 : #i97928# missed hu_HU in the initial commit 2009-01-12 22:45:02 +0100 cloph r266183 : #i98008# remove unused XSLTLIB exports 2009-01-12 00:30:16 +0100 cloph r266130 : #i97928# silence timestamp has not been update warning, reduce number of unzip calls 2009-01-11 22:02:28 +0100 cloph r266129 : #i80368# fix ambiguous inference chains, remove duplicated license files, minor other cleanup
Diffstat (limited to 'redland')
-rw-r--r--redland/raptor/makefile.mk2
-rw-r--r--redland/rasqal/makefile.mk2
-rw-r--r--redland/redland/makefile.mk2
3 files changed, 2 insertions, 4 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 4bd548ede802..d8a614aadf08 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -98,7 +98,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
CPPFLAGS+:=$(EXTRA_CFLAGS)
LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB:=$(XSLTLIB)
+XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config
.EXPORT: CPPFLAGS
.EXPORT: LDFLAGS
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index df4b640e6962..14122beb98ec 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -97,13 +97,11 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
CPPFLAGS+:=$(EXTRA_CFLAGS)
LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB:=$(XSLTLIB)
.EXPORT: CPPFLAGS
.EXPORT: LDFLAGS
.EXPORT: LIBXML2LIB
.EXPORT: ZLIB3RDLIB
-.EXPORT: XSLTLIB
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 21ac94b388d7..e5814fb549bd 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -101,7 +101,7 @@ LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.
CPPFLAGS+:=$(EXTRA_CFLAGS)
LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB:=$(XSLTLIB)
+XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config
.EXPORT: CPPFLAGS
.EXPORT: LDFLAGS