From c6a73009747814513ab5a7277c211449c7378870 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 16 Aug 2013 11:08:32 +0300
Subject: 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
---
 desktop/source/app/app.cxx            | 5 +++--
 desktop/source/app/check_ext_deps.cxx | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'desktop/source/app')

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b436adea9dfe..c11909f9edd9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <config_features.h>
+#include <config_folders.h>
 
 #include "sal/config.h"
 
@@ -240,10 +241,10 @@ void removeTree(OUString const & url) {
 // UserInstallation can be poisoned by old junk any more.
 bool cleanExtensionCache() {
     OUString buildId(
-        "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}");
+        "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}");
     rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure
     OUString extDir(
-        "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+        "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap")
         ":UserInstallation}/user/extensions");
     rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure
     OUString buildIdFile(extDir + "/buildid");
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index fbaf3e1eae63..4f834d32c6f4 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_folders.h>
+
 #include "osl/file.hxx"
 #include "osl/mutex.hxx"
 
@@ -346,7 +348,7 @@ static bool impl_needsCompatCheck()
 {
     bool bNeedsCheck = false;
     OUString aLastCheckBuildID;
-    OUString aCurrentBuildID( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" );
+    OUString aCurrentBuildID( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}" );
     rtl::Bootstrap::expandMacros( aCurrentBuildID );
 
     try {
-- 
cgit