diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-29 08:20:17 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-29 09:49:47 +0300 |
| commit | 0884201aa51b12e5f363d2e2c3f81da2426411ee (patch) | |
| tree | 9a546d3be3608f54ffd4a319a3f8fe212a88a1d6 /solenv | |
| parent | 6a14f51af652d36eed60f3b8a6b8fe995e3a7b6d (diff) | |
Only basename in component uris in DISABLE_DYNLOADING case here, too
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/settings.mk | 10 |
1 files changed, 8 insertions, 2 deletions
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 = ./ |