diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-08-25 13:35:44 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-08-25 13:35:44 +0200 |
| commit | da918f9d1cb17ad1000bb458d3d39acf1232558e (patch) | |
| tree | 96eee30ce26ef04a7d43cccf5ef7894ab1e50f63 /scp2/source/ooo | |
| parent | dfff768237552428c0e36d4425fa786dfeecdb05 (diff) | |
scp2-3layer-nicer-paths.diff: Nicer installation layout.
Don not create the extra openoffice.org3 subdir - i#90430.
Diffstat (limited to 'scp2/source/ooo')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/ooo_brand.scp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index a7c1f2826381..6d48b1cf5b3e 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -436,7 +436,7 @@ Unixlink gid_Brand_Unixlink_BasisLink // Styles = (LAYERLINK); Name = "basis-link"; Dir = gid_Dir_Brand_Root; - Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}"; + Target = "basis${OOOBASEVERSION}"; End #endif diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index cc805f9e8288..5bcd887ed4d0 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -75,7 +75,7 @@ Directory gid_Dir_Ooo_Openofficeorg #ifdef WNT HostName = "${BASISROOTNAME}"; #else - HostName = "${UNIXBASISROOTNAME}"; + HostName = "."; #endif End #endif diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp index 3cd20ef97142..47df5f2ad084 100644 --- a/scp2/source/ooo/ooo_brand.scp +++ b/scp2/source/ooo/ooo_brand.scp @@ -33,7 +33,7 @@ Directory gid_Dir_Brand_Root #ifdef WNT HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}"; #else - HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}"; + HostName = "."; #endif Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION); End |