[Libreoffice-commits] .: configure.in

Tor Lillqvist tml at kemper.freedesktop.org
Tue Jun 5 08:14:03 PDT 2012


 configure.in |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 05cc8975d17b2f2c00e794252c34dc12394abc62
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Jun 5 18:01:43 2012 +0300

    PATH for cross-compilations was broken in some way, this seems to fix it
    
    Change-Id: Ifa82be2dfae383ed8570c1d99584e67d85833612

diff --git a/configure.in b/configure.in
index bb3eed0..8f74557 100644
--- a/configure.in
+++ b/configure.in
@@ -3555,7 +3555,7 @@ if test "$cross_compiling" = "yes"; then
         fi
     done
 
-    for V in OUTDIR LO_PATH SOLARINC SOLARLIB WORKDIR; do
+    for V in OUTDIR SOLARINC SOLARLIB WORKDIR; do
         VV='$'$V
         VV=`eval "echo $VV"`
         VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
@@ -3564,6 +3564,10 @@ if test "$cross_compiling" = "yes"; then
             echo "$line" >>build-config
         fi
     done
+
+    line=`echo "LO_PATH_FOR_BUILD=$PATH" | sed -e 's,/CONF-FOR-BUILD,,g'`
+    echo "$line" >>build-config
+
     )
     test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see CONF-FOR-BUILD/config.log])
     test -f config_build.mk || AC_MSG_ERROR([A file called config_build.mk was supposed to have been copied here, but it isn't found])


More information about the Libreoffice-commits mailing list