diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
| tree | 2adc961b3c83deffcea251c41744f2626e476f38 /configmgr | |
| parent | 18041138d3169d565755565bdbabd8de596b5ac7 (diff) | |
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.
Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/components.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 84b45bbd49fc..4a1b71984ab7 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "sal/config.h" #include <algorithm> @@ -803,7 +805,7 @@ void Components::parseModificationLayer(OUString const & url) { parseFiles( Data::NO_LAYER, ".xcu", &parseXcuFile, expand( - "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") + "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/registry/data"), false); } |