Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.

This commit is contained in:
Stephan Bergmann
2011-10-21 17:18:13 +02:00
parent 3535ceeac6
commit b786a33cfd
65 changed files with 175 additions and 627 deletions

View File

@@ -303,7 +303,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
#if defined SYSTEM_MOZILLA
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
#else
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
#endif
::rtl::Bootstrap::expandMacros(rootModule);