java-gobject-introspection r109 - in trunk: . src

[walters svn gnome org]

Author: walters
Date: Sat Oct 25 15:01:10 2008
New Revision: 109
URL: http://svn.gnome.org/viewvc/java-gobject-introspection?rev=109&view=rev

Log:
Adjust for $libdir change

Modified:
   trunk/src/jgir-compile-all.in
   trunk/wscript

Modified: trunk/src/jgir-compile-all.in
==============================================================================
--- trunk/src/jgir-compile-all.in	(original)
+++ trunk/src/jgir-compile-all.in	Sat Oct 25 15:01:10 2008
@@ -2,17 +2,18 @@
 import os,sys,subprocess
 
 classpath="@CLASSPATH@"
+prefix="@PREFIX@"
+libdir=os.path.join(prefix, "lib64")
+if not os.path.isdir(libdir):
+    libdir = os.path.join(prefix, "lib")
 java_opts=os.environ.get('JAVA_OPTS', None)
 if java_opts:
     java_opts = java_opts.split(' ')
 else:
     java_opts = []
-datadirs = os.environ.get('XDG_DATA_DIRS', '/usr/share')
 nsversions = []
-for dirname in datadirs.split(':'):
+def compile_typelibs(dirname):
     repodir = os.path.join(dirname, 'girepository')
-    if not os.access(repodir, os.W_OK):
-        continue
     for name in os.listdir(repodir):
         if not name.endswith('.typelib'):
             continue
@@ -27,6 +28,8 @@
                               stdout=sys.stdout,
                               stderr=sys.stderr,
                               close_fds=True)
+compile_typelibs(libdir)
+
 subprocess.check_call(['java', '-cp', classpath, 'org.gnome.gir.compiler.CodeFactory',
                        '--verify', ','.join(nsversions)],
                       stdout=sys.stdout,

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sat Oct 25 15:01:10 2008
@@ -69,7 +69,7 @@
   compscript.chmod = 0755
   compscript.source = 'src/jgir-compile-all.in'
   compscript.target = 'jgir-compile-all'
-  compscript.dict = {'CLASSPATH': full_cp}
+  compscript.dict = {'CLASSPATH': full_cp, 'PREFIX': bld.env['PREFIX']}
 
   compscript = bld.new_task_gen('subst')
   compscript.install_path = "${PREFIX}/bin"