[Libreoffice-commits] .: 3 commits - configure.in

[Tor Lillqvist]

 configure.in |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit fe24578f5aae2fee7576bcfbf5046cd83becc16e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jan 16 23:54:43 2012 +0200

    Fix typo

diff --git a/configure.in b/configure.in
index 90b93fa..20411f3 100644
--- a/configure.in
+++ b/configure.in
@@ -2966,7 +2966,7 @@ if test "$cross_compiling" = "yes"; then
     done
     )
     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 Env.Build.sh was supposed to have been copied here, but it isn't found])
+    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])
     test -f Env.Build.sh || AC_MSG_ERROR([A file called Env.Build.sh was supposed to have been copied here, but it isn't found])
     perl -pi -e 's,/CONF-FOR-BUILD,,g' Env.Build.sh
     perl -pi -e 's,/CONF-FOR-BUILD,,g' config_build.mk
commit 38a09a9e3ac7c550608ed96b560a0277d9021092
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jan 16 23:50:58 2012 +0200

    Env.Build.sh should source config_build.mk

diff --git a/configure.in b/configure.in
index 488c6b7..90b93fa 100644
--- a/configure.in
+++ b/configure.in
@@ -2941,7 +2941,7 @@ if test "$cross_compiling" = "yes"; then
     test -f ./Env.Host.sh 2>/dev/null || exit
     test -f ./config_host.mk 2>/dev/null || exit
     cp config_host.mk ../config_build.mk
-    cp Env.Host.sh ../Env.Build.sh
+    sed -e 's/config_host.mk/config_build.mk/' <Env.Host.sh >../Env.Build.sh
     cp config.log ../config.Build.log
     . ./config_host.mk
     . ./Env.Host.sh
commit 322085e0ea9d8323ced8aeb26d81e140e35af3d5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jan 16 23:45:35 2012 +0200

    There is no desktop/scripts/soffice.sh.in any more

diff --git a/configure.in b/configure.in
index 1fccd1e..488c6b7 100644
--- a/configure.in
+++ b/configure.in
@@ -2915,7 +2915,6 @@ if test "$cross_compiling" = "yes"; then
         set_soenv.in \
         solenv/inc/langlist.mk \
         solenv/inc/postset.mk \
-        desktop/scripts/soffice.sh.in \
     | (cd CONF-FOR-BUILD && tar xf -)
     (
     unset COM GUI GUIBASE OS CPU CPUNAME