Remove basisVERSION from distro scripts as it is not used anymore.

4 files changed, 106 insertions, 106 deletions

diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index c18a2c42d520..98fb546dd626 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -59,7 +59,7 @@ if test -f $DESTDIR$INSTALLDIR/help/en/sbasic.cfg -a \
 fi
 
 echo "Fixing permissions..."
-for dir in $DESTDIR$DOCDIR $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/examples ; do
+for dir in $DESTDIR$DOCDIR $DESTDIR$INSTALLDIR/sdk/examples ; do
     if test -d $dir -a -w $dir ; then
 	find "$dir" -type f \( -name "*.txt" -o -name "*.java" -o -name "*.xml"    -o \
 			       -name "*.xcu" -o -name "*.xcs"  -o -name "*.html"   -o \
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 466a9ad7b94d..f988e12f3017 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -182,9 +182,9 @@ if test "$WITH_COMPAT_OOWRAPPERS" = "YES" ; then
 fi
 
 echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";
-mkdir -p $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program
-sed -e "s|@INSTALLDIR@|$INSTALLDIR|g" bin/java-set-classpath.in >| "$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" || exit 1;
-chmod 755 "$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath"
-test -f $DESTDIR/gid_Module_Root_Brand && echo "$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" >>$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR$INSTALLDIR/program
+sed -e "s|@INSTALLDIR@|$INSTALLDIR|g" bin/java-set-classpath.in >| "$DESTDIR$INSTALLDIR/program/java-set-classpath" || exit 1;
+chmod 755 "$DESTDIR$INSTALLDIR/program/java-set-classpath"
+test -f $DESTDIR/gid_Module_Root_Brand && echo "$INSTALLDIR/program/java-set-classpath" >>$DESTDIR/gid_Module_Root_Brand
 
 exit 0
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index eaabf9c83e7c..d00d9eaa974c 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -186,7 +186,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then
             for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
                 test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
-                mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/basis$PRODUCTVERSION/help/.*
+                mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.*
                 add_used_directories $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt
             done
         fi
@@ -206,28 +206,28 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
     # kde subpackage
     test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde_list.txt || :
     mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/fps_kde.uno.so
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_kdel..so
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libkabdrv1.so
+    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/fps_kde.uno.so
+    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kdel..so
+    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1.so
     add_used_directories kde_list.txt common_list.txt
 
     # create kde4 subpackage
-    mv_file_between_flists kde4_list.txt kde_list.txt    $INSTALLDIR/basis$PRODUCTVERSION/program/kde4be1.uno.so
-    mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_kde4l..so
-    mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/fps_kde4.uno.so
+    mv_file_between_flists kde4_list.txt kde_list.txt    $INSTALLDIR/program/kde4be1.uno.so
+    mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kde4l..so
+    mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/fps_kde4.uno.so
     add_used_directories kde4_list.txt common_list.txt
 
     # gnome subpackage
     test -f $DESTDIR/gid_Module_Optional_Gnome && cp $DESTDIR/gid_Module_Optional_Gnome gnome_list.txt || :
-    mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libevoab2.so
-    mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_gtk[0-9]*l..so
-    mv_file_between_flists common_list.txt gnome_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/ucpgvfs1.uno.so
+    mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/program/libevoab2.so
+    mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/program/libvclplug_gtk[0-9]*l..so
+    mv_file_between_flists common_list.txt gnome_list.txt $INSTALLDIR/program/ucpgvfs1.uno.so
     add_used_directories gnome_list.txt common_list.txt
 
     # mono subpackage
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/cli_.*.dll
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/cli_.*.dll.config
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/policy.*.cli_.*.dll
+    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll
+    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll.config
+    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/policy.*.cli_.*.dll
     mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/cli_.*.dll
     mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/cli_.*.dll.config
     mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/policy.*.cli_.*.dll
@@ -243,14 +243,14 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         else
             flist=mailmerge_list.txt
         fi
-        mv_file_between_flists $flist common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/mailmerge.py
+        mv_file_between_flists $flist common_list.txt $INSTALLDIR/program/mailmerge.py
         add_used_directories $flist common_list.txt
     fi
 
     if test "z$OOO_VENDOR" = "zNovell" ; then
         # officebean subpackage
-        mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/officebean.jar
-        mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libofficebean.so
+        mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/classes/officebean.jar
+        mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/libofficebean.so
         add_used_directories officebean_list.txt common_list.txt
     fi
 
@@ -260,10 +260,10 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/docs.*"
         mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/examples"
         mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/index.html"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir $INSTALLDIR/basis$PRODUCTVERSION/sdk/examples.*"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/sdk/docs"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/sdk/examples.*"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html"
+        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir $INSTALLDIR/sdk/examples.*"
+        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/sdk/docs"
+        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/sdk/examples.*"
+        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/sdk/index.html"
         add_used_directories sdk_doc_list.txt sdk_list.txt
     fi
 
@@ -271,12 +271,12 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         # move the prebuilt icons into a hacky temporary package
         # we want to repack them into a noarch package as soon as possible
         # without the build dependency on the huge devel package
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_classic8.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_crystal.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_hicontrast.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_industrial.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_tango.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images.zip
+        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_classic8.zip
+        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_crystal.zip
+        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_hicontrast.zip
+        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_industrial.zip
+        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_tango.zip
+        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images.zip
     fi
 
     # Mandriva packaging
@@ -286,29 +286,29 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         remove_file common_list.txt $INSTALLDIR/share/dict/ooo/dictionary.lst
 
         # And these are in -draw package
-        mv_file_between_flists draw_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_filters.xcu
-        mv_file_between_flists draw_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_types.xcu
+        mv_file_between_flists draw_list.txt common_list.txt $INSTALLDIR/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_filters.xcu
+        mv_file_between_flists draw_list.txt common_list.txt $INSTALLDIR/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_types.xcu
 
         # And these are in -impress package
-        mv_file_between_flists impress_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impressgraphics_filters.xcu
-        mv_file_between_flists impress_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impressgraphics_types.xcu
+        mv_file_between_flists impress_list.txt common_list.txt $INSTALLDIR/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impressgraphics_filters.xcu
+        mv_file_between_flists impress_list.txt common_list.txt $INSTALLDIR/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impressgraphics_types.xcu
 
         # Split out the gallery
-        mv_file_between_flists gallery_list.txt common_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/share/gallery.*"
+        mv_file_between_flists gallery_list.txt common_list.txt "$INSTALLDIR/share/gallery.*"
         test -r galleries.txt && cat galleries.txt >> gallery_list.txt
 
         # Split out dtd-officedocument1.0
         mv_file_between_flists dtd_list.txt common_list.txt "$INSTALLDIR/share/dtd/officedocument.*"
 
         # Split out java stuff
-        mv_file_between_flists java_common_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/JREProperties.class
-        mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/program/classes.*"
-        mv_file_between_flists java_common_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libofficebean.so
-        mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/share/Scripts/java.*"
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/aportisdoc.jar
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/pocketword.jar
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/pexcel.jar
-        mv_file_between_flists java_common_list.txt writer_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/writer2latex.jar
+        mv_file_between_flists java_common_list.txt common_list.txt $INSTALLDIR/program/JREProperties.class
+        mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/program/classes.*"
+        mv_file_between_flists java_common_list.txt common_list.txt $INSTALLDIR/program/libofficebean.so
+        mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/share/Scripts/java.*"
+        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/aportisdoc.jar
+        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/pocketword.jar
+        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/pexcel.jar
+        mv_file_between_flists java_common_list.txt writer_list.txt $INSTALLDIR/program/classes/writer2latex.jar
 
         # Move arch-dependent/dup files from common to core
         for f in \
@@ -335,35 +335,35 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
             program/unopkg.bin \
             program/uri-encode
         do
-            mv_file_between_flists core_list.txt common_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/$f"
+            mv_file_between_flists core_list.txt common_list.txt "$INSTALLDIR/$f"
         done
 
         # Put gtk/gnome stuff into gnome package
-        mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/gnome-open-url.bin
-        mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/ucpgvfs1.uno.so
+        mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/program/gnome-open-url.bin
+        mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/program/ucpgvfs1.uno.so
 
         # Ship ooqstart for gnome in gnome package
         mv_file_between_flists gnome_list.txt core_list.txt "$INSTALLDIR/program/libqstart_gtk680.*"
 
         # themes are included in other packages
         # don't use remove_file as we don't want them removed from the buildroot.
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_crystal.zip
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_hicontrast.zip
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_industrial.zip
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_tango.zip
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images.zip
+        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/share/config/images_crystal.zip
+        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/share/config/images_hicontrast.zip
+        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/share/config/images_industrial.zip
+        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/share/config/images_tango.zip
+        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/share/config/images.zip
     fi
 
     # remove known duplicities to do not have files packaged in two packages
     # the Bulgarian fixes can be removed after the issue #54110 is fixed
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/arrowhd.soe
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/classic.sog
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/hatching.soh
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/modern.sog
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/palette.soc
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/styles.sod
+    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/arrowhd.soe
+    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/classic.sog
+    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/hatching.soh
+    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/modern.sog
+    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/palette.soc
+    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/styles.sod
     # the British fixes can be removed after the issue #54113 is fixed
-    remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/standard.sog
+    remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/presets/config/standard.sog
 
 else
 
@@ -424,9 +424,9 @@ else
     if [ -e gid_Module_Optional_Pymailmerge ]; then
         create_package_directory gid_Module_Optional_Pymailmerge    pkg/libreoffice-emailmerge
     else # post m26
-        mkdir -p pkg/libreoffice-emailmerge/$INSTALLDIR/basis$PRODUCTVERSION/program
-        mv pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/program/mailmerge.py \
-            pkg/libreoffice-emailmerge/$INSTALLDIR/basis$PRODUCTVERSION/program/mailmerge.py
+        mkdir -p pkg/libreoffice-emailmerge/$INSTALLDIR/program
+        mv pkg/libreoffice-common/$INSTALLDIR/program/mailmerge.py \
+            pkg/libreoffice-emailmerge/$INSTALLDIR/program/mailmerge.py
     fi
     create_package_directory gid_Module_Optional_OGLTrans           pkg/libreoffice-ogltrans
 
@@ -450,9 +450,9 @@ else
         # some help files are in _Langpack_{Writer,Impress,...}_<lang>
         # move them from -l10n to -help
         if [ "$l" = "en-US" ]; then d=en; else d=$l; fi
-        mv pkg/libreoffice-l10n-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d/* \
-            pkg/libreoffice-help-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d && \
-        rmdir pkg/libreoffice-l10n-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d
+        mv pkg/libreoffice-l10n-$l/$INSTALLDIR/help/$d/* \
+            pkg/libreoffice-help-$l/$INSTALLDIR/help/$d && \
+        rmdir pkg/libreoffice-l10n-$l/$INSTALLDIR/help/$d
     done
 
     # move_wrappers <directory_name> <name> [...]
@@ -485,7 +485,7 @@ else
     move_wrappers pkg/libreoffice-draw lodraw
 
     # Move all libraries, binaries, *.rdb from -common to -core
-    for d in $INSTALLDIR/basis$PRODUCTVERSION/program $INSTALLDIR/program; do \
+    for d in $INSTALLDIR/program $INSTALLDIR/program; do \
       if [ ! -d $DESTDIR/pkg/libreoffice-core/$d ]; then \
       mkdir -p $DESTDIR/pkg/libreoffice-core/$d; \
       fi &&
@@ -511,13 +511,13 @@ else
     fi
     mv etc/bash_completion.d/libreoffice$BINSUFFIX.sh \
         pkg/libreoffice-common/etc/bash_completion.d
-    mv .$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath \
+    mv .$INSTALLDIR/program/java-set-classpath \
         pkg/libreoffice-common/$INSTALLDIR/program
     if echo $WITH_LANG_LIST | grep -q en-US; then
         for i in forms/resume.ott officorr/project-proposal.ott; do \
-            mkdir -p pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/`dirname $i`; \
-            mv .$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/$i \
-                pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/$i; \
+            mkdir -p pkg/libreoffice-common/$INSTALLDIR/share/template/en-US/`dirname $i`; \
+            mv .$INSTALLDIR/share/template/en-US/$i \
+                pkg/libreoffice-common/$INSTALLDIR/share/template/en-US/$i; \
         done; \
     fi
     # Warn for any remaining files
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index e694aeb53795..09c75c66f06b 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -2,46 +2,46 @@
 
 . ./*[Ee]nv.[Hh]ost.sh
 
-if test -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk ; then
+if test -d $DESTDIR$INSTALLDIR/sdk ; then
 
     echo "SDK installation clean up"
 
     # bin potential .orig files
-    find $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk -name "*.orig" -exec rm -f {} \;
+    find $DESTDIR$INSTALLDIR/sdk -name "*.orig" -exec rm -f {} \;
 
     # move some SDK directories to the right place according to FHS
-    # note that examples must stay in $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk because there are used
-    # relative paths to $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/setting and it does not work via
+    # note that examples must stay in $DESTDIR$INSTALLDIR/sdk because there are used
+    # relative paths to $DESTDIR$INSTALLDIR/sdk/setting and it does not work via
     # a symlink
     mkdir -p $DESTDIR$PREFIXDIR/include
     mkdir -p $DESTDIR$DATADIR/idl
     mkdir -p $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk
     mkdir -p $DESTDIR$DOCDIR/sdk
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/include      $DESTDIR$PREFIXDIR/include/$INSTALLDIRNAME
-    if [ -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes ]; then
-        mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes      $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk/classes
+    mv $DESTDIR$INSTALLDIR/sdk/include      $DESTDIR$PREFIXDIR/include/$INSTALLDIRNAME
+    if [ -d $DESTDIR$INSTALLDIR/sdk/classes ]; then
+        mv $DESTDIR$INSTALLDIR/sdk/classes      $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk/classes
     fi
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/idl          $DESTDIR$DATADIR/idl/$INSTALLDIRNAME
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/docs         $DESTDIR$DOCDIR/sdk
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/share/readme $DESTDIR$DOCDIR/sdk/readme
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html   $DESTDIR$DOCDIR/sdk
+    mv $DESTDIR$INSTALLDIR/sdk/idl          $DESTDIR$DATADIR/idl/$INSTALLDIRNAME
+    mv $DESTDIR$INSTALLDIR/sdk/docs         $DESTDIR$DOCDIR/sdk
+    mv $DESTDIR$INSTALLDIR/sdk/share/readme $DESTDIR$DOCDIR/sdk/readme
+    mv $DESTDIR$INSTALLDIR/sdk/index.html   $DESTDIR$DOCDIR/sdk
 
     # compat symlinks
-    ln -sf $PREFIXDIR/include/$INSTALLDIRNAME                        $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/include
-    ln -sf $DATADIR/$INSTALLDIRNAME/sdk/classes                      $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes
-    ln -sf $DATADIR/idl/$INSTALLDIRNAME                              $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/idl
-    ln -sf $DOCDIR/sdk/docs                                          $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/
-    ln -sf $DOCDIR/sdk/index.html                                    $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html
-    ln -sf $INSTALLDIR/basis$PRODUCTVERSION/sdk/examples         $DESTDIR$DOCDIR/sdk/examples
+    ln -sf $PREFIXDIR/include/$INSTALLDIRNAME                        $DESTDIR$INSTALLDIR/sdk/include
+    ln -sf $DATADIR/$INSTALLDIRNAME/sdk/classes                      $DESTDIR$INSTALLDIR/sdk/classes
+    ln -sf $DATADIR/idl/$INSTALLDIRNAME                              $DESTDIR$INSTALLDIR/sdk/idl
+    ln -sf $DOCDIR/sdk/docs                                          $DESTDIR$INSTALLDIR/sdk/
+    ln -sf $DOCDIR/sdk/index.html                                    $DESTDIR$INSTALLDIR/sdk/index.html
+    ln -sf $INSTALLDIR/sdk/examples         $DESTDIR$DOCDIR/sdk/examples
 
     # fix file list
-    sed -e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/include|\1$PREFIXDIR/include/$INSTALLDIRNAME|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes|\1$DATADIR/$INSTALLDIRNAME/sdk/classes|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/idl|\1$DATADIR/idl/$INSTALLDIRNAME|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/docs|\1$DOCDIR/sdk/docs|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/share/readme|\1$DOCDIR/sdk/readme|" \
-	-e "s|^$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html$|$DOCDIR/sdk/index.html|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/share.*$||" \
+    sed -e "s|^\(%dir \)\?$INSTALLDIR/sdk/include|\1$PREFIXDIR/include/$INSTALLDIRNAME|" \
+	-e "s|^\(%dir \)\?$INSTALLDIR/sdk/classes|\1$DATADIR/$INSTALLDIRNAME/sdk/classes|" \
+	-e "s|^\(%dir \)\?$INSTALLDIR/sdk/idl|\1$DATADIR/idl/$INSTALLDIRNAME|" \
+	-e "s|^\(%dir \)\?$INSTALLDIR/sdk/docs|\1$DOCDIR/sdk/docs|" \
+	-e "s|^\(%dir \)\?$INSTALLDIR/sdk/share/readme|\1$DOCDIR/sdk/readme|" \
+	-e "s|^$INSTALLDIR/sdk/index.html$|$DOCDIR/sdk/index.html|" \
+	-e "s|^\(%dir \)\?$INSTALLDIR/sdk/share.*$||" \
 	-e "/\.orig$/D" \
 	-e "/^$/D" \
 	$DESTDIR/gid_Module_Root_SDK | sort -u \
@@ -54,19 +54,19 @@ if test -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk ; then
     echo "%dir $DOCDIR/sdk/docs"                                >>$DESTDIR/gid_Module_Root_SDK
     echo "%dir $DOCDIR/sdk"                                     >>$DESTDIR/gid_Module_Root_SDK
     echo "%dir $DOCDIR"                                         >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/include"     >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes"     >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/idl"         >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/docs"        >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html"  >>$DESTDIR/gid_Module_Root_SDK
+    echo "$INSTALLDIR/sdk/include"     >>$DESTDIR/gid_Module_Root_SDK
+    echo "$INSTALLDIR/sdk/classes"     >>$DESTDIR/gid_Module_Root_SDK
+    echo "$INSTALLDIR/sdk/idl"         >>$DESTDIR/gid_Module_Root_SDK
+    echo "$INSTALLDIR/sdk/docs"        >>$DESTDIR/gid_Module_Root_SDK
+    echo "$INSTALLDIR/sdk/index.html"  >>$DESTDIR/gid_Module_Root_SDK
     echo "$DOCDIR/sdk/examples"                                 >>$DESTDIR/gid_Module_Root_SDK
 
     # generate default profiles
     for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
         sed -e "s,@OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
-	    -e "s,@OO_SDK_HOME@,$INSTALLDIR/basis$PRODUCTVERSION/sdk," \
+	    -e "s,@OO_SDK_HOME@,$INSTALLDIR/sdk," \
 	    -e "s,@OFFICE_HOME@,$INSTALLDIR," \
-	    -e "s,@OO_SDK_URE_HOME@,$INSTALLDIR/basis$PRODUCTVERSION/ure-link," \
+	    -e "s,@OO_SDK_URE_HOME@,$INSTALLDIR/ure-link," \
 	    -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
 	    -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
 	    -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
@@ -74,12 +74,12 @@ if test -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk ; then
 	    -e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \
 	    -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
 	    -e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
-            $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/$file.in \
-	    > $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/$file
-	chmod 755 $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/$file
-	echo $INSTALLDIR/basis$PRODUCTVERSION/sdk/$file >>$DESTDIR/gid_Module_Root_SDK
+            $DESTDIR$INSTALLDIR/sdk/$file.in \
+	    > $DESTDIR$INSTALLDIR/sdk/$file
+	chmod 755 $DESTDIR$INSTALLDIR/sdk/$file
+	echo $INSTALLDIR/sdk/$file >>$DESTDIR/gid_Module_Root_SDK
     done
 
     # FIXME: I rather set this file to be non-world-writttable for now, i#64812
-    chmod go-w $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/settings/component.uno.map
+    chmod go-w $DESTDIR$INSTALLDIR/sdk/settings/component.uno.map
 fi