From: Johan Dahlin Date: Fri, 22 Aug 2008 21:48:23 +0000 (+0000) Subject: Check for ../gobject-introspection-1.0.pc.in to determine if we run X-Git-Tag: GOBJECT_INTROSPECTION_0_5_0~103 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b7889fa1e7c1ecb3204a6416f3968153b3447ac;p=platform%2Fupstream%2Fgobject-introspection.git Check for ../gobject-introspection-1.0.pc.in to determine if we run 2008-08-22 Johan Dahlin * giscanner/sourcescanner.py: Check for ../gobject-introspection-1.0.pc.in to determine if we run installed or uninstalled. svn path=/trunk/; revision=464 --- diff --git a/ChangeLog b/ChangeLog index 1d4447c..058ee63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-08-22 Johan Dahlin + * giscanner/sourcescanner.py: + Check for ../gobject-introspection-1.0.pc.in to determine + if we run installed or uninstalled. + +2008-08-22 Johan Dahlin + * gir/Makefile.am: * giscanner/sourcescanner.py: Send in undefs/defines via writing it directly to stdin diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 4315cdc..cc0373a 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -236,8 +236,10 @@ class SourceScanner(object): defines.append('__G_LIBCONFIG_H__') dirname = os.path.dirname(os.path.abspath(__file__)) - includedir = os.path.join(dirname, '..', 'giscanner') - if not os.path.exists(includedir): + if os.path.exists( + os.path.join(dirname, '..', 'gobject-introspection-1.0.pc.in')): + includedir = os.path.join(dirname, '..', 'giscanner') + else: includedir = INCLUDEDIR filenames.insert(0, os.path.join(includedir, 'glibconfig-scanner.h'))