summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2009-09-04 14:10:16 -0400
committerColin Walters <walters@verbum.org>2009-09-04 14:10:16 -0400
commit75dcb100724f97117d518b1831e3965e3e0cf5ed (patch)
treede8259e4e98784b288c7075422d5e0ecfea5d3b7
parentbd2e04700ac0fbee6bb82032b5bda6bb2177ec0b (diff)
downloadgobject-introspection-75dcb100724f97117d518b1831e3965e3e0cf5ed.tar.gz
Bug 593162 - Use built scanner from tarball builds
Looking for .git/.svn breaks in tarball scenarios; instead just see if our source directory is named 'tools'.
-rwxr-xr-xtools/g-ir-scanner.in7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/g-ir-scanner.in b/tools/g-ir-scanner.in
index 4c4d9270..d2ef89c6 100755
--- a/tools/g-ir-scanner.in
+++ b/tools/g-ir-scanner.in
@@ -24,10 +24,9 @@ import sys
# This only works on unix systems
currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
-basedir = os.path.abspath(os.path.join(currentdir, '..'))
-if (os.path.exists(os.path.join(basedir, '.svn')) or
- os.path.exists(os.path.join(basedir, '.git'))):
- path = basedir
+current_name = os.path.basename(currentdir)
+if current_name == 'tools':
+ path = os.path.abspath(os.path.join(currentdir, '..'))
else:
# This is a private directory, we don't want to pollute the global
# namespace.