summaryrefslogtreecommitdiff
path: root/solenv/bin/ooinstall
diff options
context:
space:
mode:
authorHanno Meyer-Thurow <h.mth@web.de>2011-04-20 15:30:08 +0200
committerPetr Mladek <pmladek@suse.cz>2011-04-20 15:30:08 +0200
commiteed8e0b62e6c8b2c973df38acb4a454be58e3cc4 (patch)
tree38e6776d9c66bd5fadeb9fa661fa708a592faee7 /solenv/bin/ooinstall
parent03ead18c2aca845545091fae706ef71c1f460864 (diff)
make the installation dir better configurable
install to %libdir% intead of %prefix% as it is usual for other projects; use the usual DESTDIR instead of OODESTDIR Note that the default installation path is /usr/local/lib/libreoffice; it can be redefined by --prefix, --libdir, --with-install-dirname configure options Some of these changes contributed by Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'solenv/bin/ooinstall')
-rwxr-xr-xsolenv/bin/ooinstall6
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 2a2d2ad2c91e..83717fa68e1e 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -67,9 +67,9 @@ my @larr = grep { $_ ne '' } split(/ /, $langs);
$langs = join (",", @larr);
$destdir='';
-if ( defined $ENV{OODESTDIR} &&
- $ENV{OODESTDIR} ne "" ) {
- $destdir = "-destdir \"$ENV{OODESTDIR}\"";
+if ( defined $ENV{DESTDIR} &&
+ $ENV{DESTDIR} ne "" ) {
+ $destdir = "-destdir \"$ENV{DESTDIR}\"";
}
$strip='';