summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-02-24 11:46:39 +0100
committerPetr Mladek <pmladek@suse.cz>2012-02-24 13:31:54 +0100
commit05e415f8e98107ef4267939d93b641a35d58cce2 (patch)
tree6592c650669f10060cc2ac5b435acdb0a9ad3428
parente80d2ea82edf686bf92a6988c1a194a5fc5649d0 (diff)
fdo#46377 BASISINSTALLLOCATION = INSTALLLOCATION
Signed-off-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r--scp2/source/ooo/common_brand.scp2
-rw-r--r--scp2/source/ooo/registryitem_ooo.scp8
2 files changed, 5 insertions, 5 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index aa8c77a44d49..bb5e8ca7b834 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1387,7 +1387,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
Section = "Bootstrap";
Order = 4;
Key = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
+ Value = "[INSTALLLOCATION]";
Inifiletablekey = "BasisInstallLocation";
Inifiletableaction = "1";
Styles = (INIFILETABLE);
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 5bc40d6bf36d..803f9798b42c 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -334,7 +334,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
+ Value = "[INSTALLLOCATION]";
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
@@ -343,7 +343,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
+ Value = "[INSTALLLOCATION]";
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
@@ -352,7 +352,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%PRODUCTVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
+ Value = "[INSTALLLOCATION]";
Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_PRODUCTVERSION);
End
@@ -361,7 +361,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
+ Value = "[INSTALLLOCATION]";
Styles = (ALWAYS_REQUIRED);
End