summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2011-12-20 16:33:26 +0100
committerPetr Mladek <pmladek@suse.cz>2011-12-20 19:47:34 +0100
commitec9230598eaa507a4e8971f20d893169c846c9d7 (patch)
treec13a6f9bdc22b48ad801c8f597d7118e4d839f4b /solenv
parentc5ed0b8f95600c3ceacbcd4511dc3a7b4cabcbae (diff)
allow to call ooinstall twice with $DESTDIR
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/ooinstall9
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 " .