better wording.

[feisty_meow.git] / scripts / generator / build_variables.sh

diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index 10ad9ccd32c1b75557370d7d5c505631e1b73082..9281730febe0be3e14427bb2e484a2b5ed214b15 100644 (file)
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -71,13 +71,6 @@ export CLAM_DIR="$(cd $BUILD_SCRIPTS_DIR/../clam ; \pwd)"
 # synonym to make other builds happy.
 export BUILDER_DIR="$BUILDING_HIERARCHY"
 
-# guess the current platform.
-IS_UNIX=$(uname | grep -i linux)
-if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i unix); fi
-if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i darwin); fi
-IS_DOS=$(uname | grep -i ming)
-if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi
-
 # set some clam parameters for compilation.  if the script can't guess the
 # right configuration, then you will need to set them in the last 'else'
 # below.
@@ -95,6 +88,11 @@ if [ ! -z "$SHELL_DEBUG" ]; then
   echo "[FEISTY_MEOW_DIR is $FEISTY_MEOW_DIR]"
 fi
 
+#if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
+#  # harsh on the paths and make them use backwards slashes.
+#  export SERIOUS_SLASH_TREATMENT=true
+#fi
+
 # new BUILD_TOP variable points at the utter top-most level of any files
 # in the building hierarchy.
 export BUILD_TOP="$FEISTY_MEOW_DIR"
@@ -114,11 +112,13 @@ fi
 
 # debugging area where we say what we think we know.
 
-echo scripts: $BUILD_SCRIPTS_DIR
-echo build tools hier: $BUILDING_HIERARCHY
-echo this tool: $THIS_TOOL_NAME
-echo repository: $FEISTY_MEOW_DIR
-echo clam: $CLAM_DIR
+if [ ! -z "$SHELL_DEBUG" ]; then
+  echo scripts: $BUILD_SCRIPTS_DIR
+  echo build tools hier: $BUILDING_HIERARCHY
+  echo this tool: $THIS_TOOL_NAME
+  echo repository: $FEISTY_MEOW_DIR
+  echo clam: $CLAM_DIR
+fi
 
 ##############
 
@@ -193,7 +193,7 @@ if [ -z "$got_bad" ]; then
   
   # we should have established our internal variables now, so let's try
   # using them.
-  export PATH=$BINARY_DIR:$PATH
+  export PATH=$(dos_to_unix_path $BINARY_DIR):$PATH
   
   # load up the helper variables for visual studio on winders.
   if [ "$OPERATING_SYSTEM" == "WIN32" ]; then