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 /unotools | |
| 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 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 1a9df9c3b749..e83eb4f92c99 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <stdio.h> @@ -70,7 +71,7 @@ namespace utl { OUString uri; rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); - return uri + "/program/" SAL_CONFIGFILE("bootstrap"); + return uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap"); } } @@ -783,7 +784,7 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa // try to open version.ini (versionrc) OUString uri; rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); - rtl::Bootstrap aData( uri + "/program/" SAL_CONFIGFILE("version") ); + rtl::Bootstrap aData( uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ); if ( aData.getHandle() == NULL ) // version.ini (versionrc) doesn't exist return sal_False; |