diff options
author | Andras Timar <atimar@suse.com> | 2012-02-24 11:46:39 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-02-24 11:46:39 +0100 |
commit | 06dd0fda38f07a74ba8469542ed4afe93b47ee9c (patch) | |
tree | 13857957daeac6d3fef87ccf2cc04c59362f44f3 /scp2 | |
parent | fdo#44717 More helpful text when installer detects a running soffice.bin (diff) | |
download | core-06dd0fda38f07a74ba8469542ed4afe93b47ee9c.tar.gz core-06dd0fda38f07a74ba8469542ed4afe93b47ee9c.zip |
fdo#46377 BASISINSTALLLOCATION = INSTALLLOCATION
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/registryitem_ooo.scp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 6ded2c46295c..69c0a716dca0 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1396,7 +1396,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 |