From 22272e3806f801a10934fe0e660414b27b900623 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Sun, 15 May 2005 22:51:56 +0000 Subject: [PATCH] OSNAME purging git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1780 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/unix/build.config | 4 ++-- sc2/build/unix/build.sh | 3 --- sc2/build/unix/config_functions | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config index eaefe1151..60f3e3f98 100644 --- a/sc2/build/unix/build.config +++ b/sc2/build/unix/build.config @@ -12,7 +12,7 @@ uqm_requirements() have_program gcc || exit 1 COMPILE="$PROG_gcc_FILE" - case "$OSNAME" in + case "$HOST_SYSTEM" in MINGW32*) have_program windres WINDRES="$PROG_windres_FILE" @@ -283,7 +283,7 @@ uqm_post_build() { # run from inside an application package, this step is useless # (the cp command in the install step implicitly strips off # the resource fork, in fact) - case "$OSNAME" in + case "$HOST_SYSTEM" in Darwin) ${REZ} ${RFORK} -o ${TARGET_FILE} ;; diff --git a/sc2/build/unix/build.sh b/sc2/build/unix/build.sh index f996c1e83..091a192d1 100644 --- a/sc2/build/unix/build.sh +++ b/sc2/build/unix/build.sh @@ -56,9 +56,6 @@ done TOPDIR="$PWD" export TOPDIR -OSNAME=`uname -s` -export OSNAME - if [ $# -lt 1 ]; then usage 1>&2 exit 1; diff --git a/sc2/build/unix/config_functions b/sc2/build/unix/config_functions index c84f66470..12e242975 100644 --- a/sc2/build/unix/config_functions +++ b/sc2/build/unix/config_functions @@ -708,7 +708,7 @@ set_host_system() { case "$BUILD_HOST" in *-*-*) HOST_SYSTEM="${BUILD_HOST#*-}" - HOST_SYSTEM="${OSNAME%-*}" + HOST_SYSTEM="${HOST_SYSTEM%-*}" ;; esac