[ooo-build-commit] .: scp2/source

[Jan Holesovsky]

 scp2/source/ooo/common_brand.scp  |    2 +-
 scp2/source/ooo/directory_ooo.scp |    2 +-
 scp2/source/ooo/ooo_brand.scp     |    2 +-
 scp2/source/sdkoo/sdkoo.scp       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9b3de7c716f7dc7023c7b3b0f1549d674fe1d4c6
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 25 13:35:44 2010 +0200

    scp2-3layer-nicer-paths.diff: Nicer installation layout.
    
    Don not create the extra openoffice.org3 subdir - i#90430.

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a7c1f28..6d48b1c 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 cc805f9..5bcd887 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 3cd20ef..47df5f2 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
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index d47e14d..47181c9 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -60,7 +60,7 @@ Directory gid_Dir_Ooo_Openofficeorg_Sdk
   #ifdef WNT
     HostName = "${BASISROOTNAME}";
   #else
-    HostName = "${UNIXBASISROOTNAME}";
+    HostName = ".";
   #endif
 End
 #endif