[Libreoffice-commits] .: download set_soenv.in

Tor Lillqvist tml at kemper.freedesktop.org
Fri May 13 10:36:57 PDT 2011


 download     |    2 +-
 set_soenv.in |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a725715e02492920cb74ba208c3b7e25196cd932
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri May 13 20:36:31 2011 +0300

    Argh, it's just host, not host_alias

diff --git a/download b/download
index 07bf86a..3a4ac9d 100755
--- a/download
+++ b/download
@@ -272,5 +272,5 @@ done
 
 [ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
 
-./post_download --build=$BUILD_ALIAS --host=$HOST_ALIAS || exit 1
+./post_download --build=$BUILD_PLATFORM --host=$HOST_PLATFORM || exit 1
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/set_soenv.in b/set_soenv.in
index 408bf4b..d001f5d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -102,7 +102,7 @@ my ( $dmake, $build, $build_client, $nmake, $mkout, $deliver, $zipdep );
 #
 # $platform is needed for PathFormat()
 #
-$platform       = '@host_alias@';
+$platform       = '@host@';
 
 $UPD            = '@UPD@';          # the project's UPD
 $newline        = "\n";             # Perl newline character
@@ -1756,8 +1756,8 @@ ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
 ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
 ToFile( "CC",                $CC,                "e" );
 ToFile( "CROSS_COMPILING",   "@CROSS_COMPILING@","e" );
-ToFile( "BUILD_ALIAS",       "@build_alias@",    "e" );
-ToFile( "HOST_ALIAS",        "@host_alias@",     "e" );
+ToFile( "BUILD_PLATFORM",    "@build@",          "e" );
+ToFile( "HOST_PLATFORM",     "@host@",           "e" );
 ToFile( "CC_FOR_BUILD",      "@CC_FOR_BUILD@",   "e" );
 ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
 ToFile( "HAVE_GCC_VISIBILITY_FEATURE",


More information about the Libreoffice-commits mailing list