merge latest changes (post-2.7.0) from viewer-development

1 files changed, 7 insertions, 3 deletions

diff --git a/build.sh b/build.sh
index d46da2c66d..4268c76e78 100755
--- a/build.sh
+++ b/build.sh
@@ -42,9 +42,13 @@ installer_Linux()
 
 installer_CYGWIN()
 {
-  d=$(build_dir_CYGWIN ${last_built_variant:-Release})
-  p=$(sed 's:.*=::' "$d/newview/${last_built_variant:-Release}/touched.bat")
-  echo "$d/newview/${last_built_variant:-Release}/$p"
+  v=${last_built_variant:-Release}
+  d=$(build_dir_CYGWIN $v)
+  if [ -r "$d/newview/$v/touched.bat" ]
+  then
+    p=$(sed 's:.*=::' "$d/newview/$v/touched.bat")
+    echo "$d/newview/$v/$p"
+  fi
 }
 
 pre_build()