From da918f9d1cb17ad1000bb458d3d39acf1232558e Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@suse.cz>
Date: Wed, 25 Aug 2010 13:35:44 +0200
Subject: scp2-3layer-nicer-paths.diff: Nicer installation layout.

Don not create the extra openoffice.org3 subdir - i#90430.
---
 scp2/source/ooo/common_brand.scp  | 2 +-
 scp2/source/ooo/directory_ooo.scp | 2 +-
 scp2/source/ooo/ooo_brand.scp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scp2/source/ooo')

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
-- 
cgit