Merge pull request #555 from nuisanceofcats/incoming

More sensible default emscripten settings that can be overriden with env...

AUTHORS

@@ -32,3 +32,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Xingxing Pan <forandom@gmail.com>
 * Justin Kerk <dopefishjustin@gmail.com>
 * Andrea Bedini <andrea.bedini@gmail.com>
+* James Pike <totoro.friend@chilon.net>

settings.py

@@ -2,14 +2,15 @@
 # IMPORTANT: Edit the *copy* with the right paths!
 # Note: If you put paths relative to the home directory, do not forget os.path.expanduser
 
-EMSCRIPTEN_ROOT = os.path.expanduser('~/Dev/emscripten') # this helps projects using emscripten find it
-
-LLVM_ROOT = os.path.expanduser('~/Dev/llvm/cbuild/bin')
+# this helps projects using emscripten find it
+EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN') or '/opt/emscripten')
+LLVM_ROOT = os.path.expanduser(os.getenv('LLVM') or '/usr/bin')
 
 # See below for notes on which JS engine(s) you need
 NODE_JS = 'node'
-SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-n']
-V8_ENGINE = os.path.expanduser('~/Dev/v8/d8')
+SPIDERMONKEY_ENGINE = [
+  os.path.expanduser(os.getenv('SPIDERMONKEY') or 'js'), '-m', '-n']
+V8_ENGINE = os.path.expanduser(os.getenv('V8') or 'd8')
 
 JAVA = 'java'