[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin

[Tomáš Chvátal]

 solenv/bin/ooinstall |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit fab993b55fef61c4db703d96a7cf0d62265890e0
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Wed Dec 28 13:35:02 2011 +0100

    Revert "allow to call ooinstall twice with $DESTDIR"
    
    This reverts commit 1048d8fa4abd3e55a45dfb6884db808da1d72c9e.
    
    This commit is no longer needed as it is fixed properly.
    Plus this commit slightly mess the environment with the new setup
    (don't ask me why it does so).

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 794e81b..cf9ad9e 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -116,15 +116,6 @@ if ($is_windows) {
            "-msilanguage $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/win_ulffiles";
 }
 
-# FIXME: a better solution would be to fix installer to deal with broken symlinks
-# make distro-pack-install shufle with the SDK installation to make it LSB compliant
-# it creates symlinks from the orignal path to /usr/share; they are not valid with $DESTDIR
-# and potential second ooinstall call fails with strange error messages if the old tree is still there
-if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
-    print "Cleaning destdir...\n";
-    system ("rm -rf \"$ENV{DESTDIR}\"") && die "Failed to clean up destdir: $!";
-}
-
 print "Running LibreOffice installer\n";
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 	"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .