diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-05 09:55:48 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-05 09:55:48 -0700 |
| commit | 3b7e9141422c6106b9f406f72bc327228945728d (patch) | |
| tree | c4c617fd4cbce98a3a14c2b2dfad987f39366ab4 /tools/shared.py | |
| parent | a9f082c2d60417730d11d2c0dc9da7e6e5ed2e00 (diff) | |
| parent | 252869f1624d58c90bcc9748464b3034dbc566da (diff) | |
fix merge conflicts
Diffstat (limited to 'tools/shared.py')
| -rw-r--r-- | tools/shared.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py index 9eeb1552..86569e73 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -1,9 +1,9 @@ import shutil, time, os from subprocess import Popen, PIPE, STDOUT -abspath = os.path.abspath(os.path.dirname(__file__)) def path_from_root(*pathelems): - return os.path.join(os.path.sep, *(abspath.split(os.sep)[:-1] + list(pathelems))) + rootpath = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) + return os.path.join(rootpath, *pathelems) CONFIG_FILE = os.path.expanduser('~/.emscripten') if not os.path.exists(CONFIG_FILE): |