diff options
author | Petr Mladek <pmladek@suse.cz> | 2011-12-20 16:33:26 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2011-12-20 19:44:45 +0100 |
commit | 1048d8fa4abd3e55a45dfb6884db808da1d72c9e (patch) | |
tree | 98ef6b9760efc2e1b69b928685a2a34ad710d12a /solenv | |
parent | 42d0322a75ac0922729d79f951186b368e69c2c5 (diff) |
allow to call ooinstall twice with $DESTDIR
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/ooinstall | 9 |
1 files changed, 9 insertions, 0 deletions
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 " . |