diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-28 01:28:16 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-28 01:29:05 -0600 |
| commit | dc0bf66e33af9b2d07cccb7e5b1bddb08c368826 (patch) | |
| tree | bda0b24c0373157363a74a85675b826f354d9349 | |
| parent | f2e7365ebc9aecb4cd9e56414ffab6023400ba67 (diff) | |
BUILDDIR <> SRCDIR in the installer too
Change-Id: I817b97b34ab7a526dbdee05b2dda8f7928a8cf5f
| -rwxr-xr-x | solenv/bin/ooinstall | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index bcc296cec90b..51f831bfab96 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -73,7 +73,7 @@ if ($help) { my $BUILD=undef; my $LAST_MINOR=undef; -open MINORMK, "$ENV{'SOLARENV'}/inc/minor.mk"; +open MINORMK, "$ENV{'BUILDDIR'}/solenv/inc/minor.mk"; while (<MINORMK>) { my $t = "\$" . $_; if (/^BUILD/ || /^LAST_MINOR/) { @@ -117,11 +117,12 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") { } print "Running LibreOffice installer\n"; + system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . "perl " . (scalar keys(%DB::sub) ? "-d " : "") . "-w $ENV{SOLARENV}/bin/make_installer.pl " . - "-f openoffice.lst -l $langs -p LibreOffice " . + "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p LibreOffice " . "-u $tmp_dir " . "-buildid $BUILD $destdir $strip $msi " . "-simple $path") && die "Failed to install: $!"; @@ -130,7 +131,7 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) { print "Running SDK installer\n"; system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . "perl -w $ENV{SOLARENV}/bin/make_installer.pl " . - "-f openoffice.lst -l en-US -p LibreOffice_SDK " . + "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l en-US -p LibreOffice_SDK " . "-u $tmp_dir " . "-buildid $BUILD $destdir $strip $msi " . "-simple $path") && die "Failed to install: $!"; |