diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 12:50:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 12:52:06 +0200 |
| commit | fd1db0b8eba8e86c5a7e1a3c685e76975d21d93c (patch) | |
| tree | 1c7843fbea76f3469eb9e9cbe7b28164753427fd /solenv | |
| parent | d37209912b44f5accee73e7f774122b195fe2183 (diff) | |
Undo basis/brand split: move program/classes/ from basis to brand.
Also removed apparently unused UNO_JAVA_COMPPATH ProfileItem.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 244e7e8c8846..18e03d426a4e 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -164,7 +164,7 @@ endef # possible directories for jar files containing UNO services gb_Jar_COMPONENTPREFIXES := \ - OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/classes/ \ + OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/classes/ \ URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \ INTERN:vnd.sun.star.expand:\dOOO_INBUILD_JAVA_DIR/ diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 595dcdb10c30..0d791e5d04e8 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1360,7 +1360,8 @@ CPPUNIT_CFLAGS = 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:$$BRAND_BASE_DIR/program/ -COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/ +COMPONENTPREFIX_BASIS_JAVA = \ + vnd.sun.star.expand:$$BRAND_BASE_DIR/program/classes/ COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: COMPONENTPREFIX_INBUILD_NATIVE = \ vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/ |