aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-04-26 17:26:38 +1000
committerDavid Walter Seikel2013-04-26 17:26:38 +1000
commita4dd5745326f4477b49e2331c45e549e821ffbee (patch)
tree71a4dc5a5358cfbb0b0e1a7e00445ef3c4f7bc7c /linden
parentMerge branch 'nmake' into next (diff)
downloadmeta-impy-a4dd5745326f4477b49e2331c45e549e821ffbee.zip
meta-impy-a4dd5745326f4477b49e2331c45e549e821ffbee.tar.gz
meta-impy-a4dd5745326f4477b49e2331c45e549e821ffbee.tar.bz2
meta-impy-a4dd5745326f4477b49e2331c45e549e821ffbee.tar.xz
Make sure the TYPE variable is actually defined for nmake builds.
Diffstat (limited to 'linden')
-rwxr-xr-xlinden/scripts/linux/4-package-viewer4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/scripts/linux/4-package-viewer b/linden/scripts/linux/4-package-viewer
index d954f02..a1a74f2 100755
--- a/linden/scripts/linux/4-package-viewer
+++ b/linden/scripts/linux/4-package-viewer
@@ -1,9 +1,11 @@
1#!/bin/bash 1#!/bin/bash
2 2
3source config-SL-source
4
3if [ "$OSTYPE" == "cygwin" ] ; then 5if [ "$OSTYPE" == "cygwin" ] ; then
4 # Assumes version has been passed in from outside, coz Windows insists on adding crap to python output. 6 # Assumes version has been passed in from outside, coz Windows insists on adding crap to python output.
5 cd ../../indra/build-nmake/ 7 cd ../../indra/build-nmake/
6 iscc newview/$TYPE/package/${version}-Windows-x86.iss 8 iscc newview/${TYPE}/package/${version}-Windows-x86.iss
7else 9else
8 cd ../../indra/viewer-linux-* 10 cd ../../indra/viewer-linux-*
9 make package 11 make package