diff options
| author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2011-09-07 22:34:38 +0200 |
|---|---|---|
| committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2011-09-07 22:34:38 +0200 |
| commit | 354476089f29452a7e826161b75b454eba07f327 (patch) | |
| tree | daa93a2c7223cd76e5813f8d71583b4fe4bccb46 /tools/g-ir-doc-tool.in | |
| parent | 0102c517c44d3e8fc3baf2394cb92281511941e3 (diff) | |
| download | gobject-introspection-354476089f29452a7e826161b75b454eba07f327.tar.gz | |
Revert "Windows port: Make g-ir-annotiotion-tool, g-ir-doc-tool and g-ir-scanner 'relocatable' at runtime."
It's a bit too soon for this one, misunderstood review on irc.
Apologies for the mess!
This reverts commit 0102c517c44d3e8fc3baf2394cb92281511941e3.
Diffstat (limited to 'tools/g-ir-doc-tool.in')
| -rw-r--r-- | tools/g-ir-doc-tool.in | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/tools/g-ir-doc-tool.in b/tools/g-ir-doc-tool.in index 02db10cd..4a84afad 100644 --- a/tools/g-ir-doc-tool.in +++ b/tools/g-ir-doc-tool.in @@ -23,12 +23,7 @@ import os import sys import __builtin__ -if os.name == 'nt': - datadir = os.path.join(os.path.dirname(__file__), '..', 'share') -else: - datadir = "@datarootdir@" - -__builtin__.__dict__['DATADIR'] = datadir +__builtin__.__dict__['DATADIR'] = "@datarootdir@" if 'GI_SCANNER_DEBUG' in os.environ: def on_exception(exctype, value, tb): @@ -43,11 +38,7 @@ if srcdir is not None: else: # This is a private directory, we don't want to pollute the global # namespace. - if os.name == 'nt': - # Makes g-ir-doc-tool 'relocatable' at runtime on Windows. - path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') - else: - path = os.path.join('@libdir@', 'gobject-introspection') + path = os.path.join('@libdir@', 'gobject-introspection') sys.path.insert(0, path) from giscanner.docmain import doc_main |