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 /setup_native | |
| 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 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx index 94351180c8af..1e30c4611245 100644 --- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx @@ -244,7 +244,7 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle) return ERROR_SUCCESS; } - // Removing complete directory "Basis\presets\bundled" + // Removing complete directory "Basis\prereg\bundled" std::_tstring sCacheDir = sInstDir + TEXT("share\\prereg\\bundled"); |