stopped using a mount, which is on an insecure device.

[feisty_meow.git] / scripts / core / variables.sh

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 21f874122e454b71b7ba8c5185fbf9b226dd2207..b71defbeb00b653c311fce599df6b32ecda2711e 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -79,6 +79,11 @@ if [ -z "$NECHUNG" ]; then
     # IS_MSYS will be non-empty if this is the msys toolset.  otherwise
     # we assume that it's cygwin.
     IS_MSYS=$(uname | grep -i ming)
+
+    # if not MSYS, then we'll assume cygwin and set the cygwin root var.
+    if [ -z "$IS_MSYS" ]; then
+      define_yeti_variable CYGROOT=$(cygpath -w -m /)
+    fi
   fi
 
   ##############
@@ -152,6 +157,7 @@ if [ -z "$NECHUNG" ]; then
   # variables for perl.
   
   define_yeti_variable PERLLIB+="/usr/lib/perl5"
+  define_yeti_variable PERL5LIB+="/usr/lib/perl5"
   if [ "$OS" == "Windows_NT" ]; then
     define_yeti_variable PERLIO=:perlio
       # choose perl's IO over the ms-windows version so we can handle file
@@ -166,6 +172,7 @@ if [ -z "$NECHUNG" ]; then
       ls $i/*.pl &>/dev/null
       if [ $? -eq 0 ]; then
         PERLLIB+=":$(dos_to_unix_path $i)"
+        PERL5LIB+=":$(dos_to_unix_path $i)"
       fi
     fi
   done
@@ -202,11 +209,11 @@ if [ -z "$NECHUNG" ]; then
     # now augment the environment if we found our build variables.
     if [ $found_build_vars == 1 ]; then
       # the binary directory contains our collection of handy programs.
-      define_yeti_variable BINDIR=$TARGETS_DIR
+      define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_DIR
       # add binaries created within build to the path.
-      define_yeti_variable PATH="$(dos_to_unix_path $BINDIR):$PATH"
+      define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_BINARIES):$PATH"
       # Shared libraries are located via this variable.
-      define_yeti_variable LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $BINDIR)"
+      define_yeti_variable LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $FEISTY_MEOW_BINARIES)"
     fi
   }