From 1048d8fa4abd3e55a45dfb6884db808da1d72c9e Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 20 Dec 2011 16:33:26 +0100 Subject: allow to call ooinstall twice with $DESTDIR --- solenv/bin/ooinstall | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index cf9ad9e1fc35..794e81b930df 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -116,6 +116,15 @@ 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 " . -- cgit v1.2.3