From 0884201aa51b12e5f363d2e2c3f81da2426411ee Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 29 Mar 2012 08:20:17 +0300 Subject: Only basename in component uris in DISABLE_DYNLOADING case here, too --- solenv/inc/settings.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 31b0174d9b3d..9988f7c0b909 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1305,12 +1305,18 @@ XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar CPPUNIT_CFLAGS = .END +.IF "$(DISABLE_DYNLOADING)" == "TRUE" +COMPONENTPREFIX_URE_NATIVE = +COMPONENTPREFIX_BASIS_NATIVE = +COMPONENTPREFIX_INBUILD_NATIVE = +.ELSE COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/ -COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ +COMPONENTPREFIX_INBUILD_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ +.ENDIF +COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/ COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: -COMPONENTPREFIX_INBUILD_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/ COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/ COMPONENTPREFIX_EXTENSION = ./ -- cgit