diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 09:47:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 09:47:41 +0200 |
| commit | 538d29f5a4d36a836124d49bb29e19a8954b34f9 (patch) | |
| tree | f46d3e9ac14031427ebdb0385ffbe076f79d99ba /unotools | |
| parent | b6ba12c7290417e9d025342087718c43b8e60c15 (diff) | |
Undo basis/brand split: move presets/ from basis to brand.
Also let utl::Bootstrap::locateBaseInstallation return
$BRAND_BASE_DIR instead of $OOO_BASE_DIR, so that things match again.
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index c2398541b126..1f960cff3315 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -58,7 +58,7 @@ #define BOOTSTRAP_ITEM_VERSIONFILE "Location" #define BOOTSTRAP_ITEM_BUILDID "buildid" -#define BOOTSTRAP_ITEM_BASEINSTALLATION "BaseInstallation" +#define BOOTSTRAP_ITEM_BASEINSTALLATION "BRAND_BASE_DIR" #define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation" #define BOOTSTRAP_ITEM_SHAREDIR "SharedDataDir" |