summaryrefslogtreecommitdiff
path: root/tools/g-ir-scanner.in
diff options
context:
space:
mode:
Diffstat (limited to 'tools/g-ir-scanner.in')
-rwxr-xr-xtools/g-ir-scanner.in13
1 files changed, 2 insertions, 11 deletions
diff --git a/tools/g-ir-scanner.in b/tools/g-ir-scanner.in
index 9a1b2bff..f709683c 100755
--- a/tools/g-ir-scanner.in
+++ b/tools/g-ir-scanner.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-scanner '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.scannermain import scanner_main