summaryrefslogtreecommitdiff
path: root/giscanner/transformer.py
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2011-07-27 09:11:02 -0400
committerColin Walters <walters@verbum.org>2011-07-27 09:15:02 -0400
commit9fcd8fa140030a270507fba0915aafa4df0933e0 (patch)
tree8274af8d78332ca7a52aa2749b2d951638c2426e /giscanner/transformer.py
parentf5f33223d876cefd56412df9d918ea7442f8322f (diff)
downloadgobject-introspection-9fcd8fa140030a270507fba0915aafa4df0933e0.tar.gz
Kill off config.py
Generating Python source code is problematic for srcdir != builddir; steal a the trick of putting global data in __builtins__ from jhbuild.
Diffstat (limited to 'giscanner/transformer.py')
-rw-r--r--giscanner/transformer.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index a651649a..7db79828 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -24,7 +24,6 @@ import sys
from . import ast
from . import message
from .cachestore import CacheStore
-from .config import DATADIR, GIR_DIR, GIR_SUFFIX
from .girparser import GIRParser
from .sourcescanner import (
SourceSymbol, ctype_name, CTYPE_POINTER,
@@ -163,8 +162,8 @@ None."""
def _find_include(self, include):
searchdirs = self._includepaths[:]
for path in _xdg_data_dirs:
- searchdirs.append(os.path.join(path, GIR_SUFFIX))
- searchdirs.append(GIR_DIR)
+ searchdirs.append(os.path.join(path, 'gir-1.0'))
+ searchdirs.append(os.path.join(DATADIR, 'gir-1.0'))
girname = '%s-%s.gir' % (include.name, include.version)
for d in searchdirs: