summaryrefslogtreecommitdiff
path: root/scripting/source/pyprov/pythonscript.py
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-16 11:08:32 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-18 21:11:16 +0300
commitc6a73009747814513ab5a7277c211449c7378870 (patch)
tree2adc961b3c83deffcea251c41744f2626e476f38 /scripting/source/pyprov/pythonscript.py
parent18041138d3169d565755565bdbabd8de596b5ac7 (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 'scripting/source/pyprov/pythonscript.py')
-rwxr-xr-xscripting/source/pyprov/pythonscript.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index d2e90ba1a5c1..a405ca4b11df 100755
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -174,9 +174,9 @@ class MyUriHelper:
def __init__( self, ctx, location ):
self.s_UriMap = \
- { "share" : "vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python" , \
+ { "share" : "vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python" , \
"share:uno_packages" : "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages", \
- "user" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \
+ "user" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \
"user:uno_packages" : "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" }
self.m_uriRefFac = ctx.ServiceManager.createInstanceWithContext("com.sun.star.uri.UriReferenceFactory",ctx)
if location.startswith( "vnd.sun.star.tdoc" ):