diff options
| author | Eitan Isaacson <eitan@monotonous.org> | 2011-03-08 17:36:47 -0500 |
|---|---|---|
| committer | Eitan Isaacson <eitan@monotonous.org> | 2011-03-09 13:05:16 -0500 |
| commit | 1bec88f45ed45f69f693c88ce3b819e89c521b28 (patch) | |
| tree | 4c4ac1ec745a71f1fea0c4ba31124ffb45b85e3e | |
| parent | f9d4f7bcf608810f977102ccb6bb32f98479eec6 (diff) | |
| download | caribou-1bec88f45ed45f69f693c88ce3b819e89c521b28.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 09a23a9..3f13b17 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: |