On Wed, 20 Apr 2011 09:42:31 +0200
Andreas Radke <a.ra...@arcor.de> wrote:
> ... (make DESTDIR=... install is broken for me).
Hi all,
I would recommend my patch attached. For that one would need
to pass '--libdir=/usr/LIBDIR' to configure to behave. Otherwise it
installs to /LIBDIR. Improvements to the patch are welcomed!
Though, this way I came close to the old behaviour.
@Petr
Would you mind to commit if it is ok, please?
Regards,
Hanno
--- Makefile.in.orig 2011-02-25 23:01:35.128013555 +0100
+++ Makefile.in 2011-02-25 23:04:53.404013587 +0100
@@ -16,11 +16,11 @@
install:
@. ./*[Ee]nv.[Ss]et.sh && \
- echo "Installing in $${prefix:-@prefix@}..." && \
- ooinstall "$${prefix:-@prefix@}" && \
+ echo "Installing in $${libdir:-@libdir@}/libreoffice..." && \
+ ooinstall "$${libdir:-@libdir@}/libreoffice" && \
echo "" && \
echo "Installation finished, you can now execute:" && \
- echo "$${prefix:-@prefix@}/program/soffice"
+ echo "$${libdir:-@libdir@}/libreoffice/program/soffice"
dev-install:
@. ./*[Ee]nv.[Ss]et.sh && \
--- solenv/bin/ooinstall.orig 2011-02-25 23:09:13.484013610 +0100
+++ solenv/bin/ooinstall 2011-02-25 23:09:43.856013608 +0100
@@ -67,9 +67,9 @@
$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='';
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
