diff options
| author | Eitan Isaacson <eitan@monotonous.org> | 2011-03-08 17:36:47 -0500 |
|---|---|---|
| committer | Eitan Isaacson <eitan@monotonous.org> | 2011-03-08 17:36:47 -0500 |
| commit | 2ddf12c4bc8665f7ce55c83e8cc6de5d7e5c1ab4 (patch) | |
| tree | eaa8de45f35c53efc68e333c808f097c74f949b8 | |
| parent | 0aa3ff942a1a7a7c3229703c9878ec416731c2df (diff) | |
| download | caribou-2ddf12c4bc8665f7ce55c83e8cc6de5d7e5c1ab4.tar.gz | |
Read keyboard files from prefix correctly
| -rw-r--r-- | bin/caribou.in | 3 | ||||
| -rw-r--r-- | caribou/common/settings.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/bin/caribou.in b/bin/caribou.in index 35ef584..824c68d 100644 --- a/bin/caribou.in +++ b/bin/caribou.in @@ -45,6 +45,9 @@ if os.path.dirname(__file__) != "@prefix@/bin": sys.path.insert(1, srcdir) import caribou.common import caribou.ui + caribou.data_path = os.path.abspath(os.path.join(os.path.dirname(__file__), + "@top_srcdir@", + "data")) else: import caribou.common import caribou.ui diff --git a/caribou/common/settings.py b/caribou/common/settings.py index b5df28e..0393079 100644 --- a/caribou/common/settings.py +++ b/caribou/common/settings.py @@ -13,10 +13,6 @@ else: HAS_JSON = True def fetch_keyboards(): - if True: - const.KEYBOARDS_DIR = os.path.abspath( - os.path.join(os.path.dirname(__file__), '../../data/keyboards')) - try: files = os.listdir(const.KEYBOARDS_DIR) except: |