From a569063e4f25c73988dbd1a49fec4810877e4df9 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 3 Nov 2008 21:11:28 +0000 Subject: [PATCH] Fix location of libmozjs.so for Ubuntu /usr/lib/xulrunner-/lib in the previous patch was wrong, should be /usr/lib/xulrunner-. Also, fix comment. svn path=/trunk/; revision=28 --- tools/build/jhbuildrc-gnome-shell | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell index 8a1cd9160..7155fb9f1 100644 --- a/tools/build/jhbuildrc-gnome-shell +++ b/tools/build/jhbuildrc-gnome-shell @@ -38,10 +38,10 @@ addpath('XDG_DATA_DIRS', '/usr/share') addpath('XDG_CONFIG_DIRS', '/etc/xdg') # -# For Ubuntu Intrepid, libmozjs lives in /usr/lib/xulrunner-/lib +# For Ubuntu Intrepid, libmozjs lives in /usr/lib/xulrunner- # However, that path isn't in ld.so.conf, meaning that it's basically # impossible to use the xulrunner .pc files and libraries. Work around -# this by deriving the path and adding it to LD_SO_CONF ourself. +# this by deriving the path and adding it to LD_LIBRARY_PATH ourself. # import re import subprocess @@ -50,7 +50,7 @@ _pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'], _sdkdir = _pkgconfig.communicate()[0].strip() _pkgconfig.wait() if _pkgconfig.returncode == 0: - _libdir = re.sub('-(sdk|devel)', '', _sdkdir) + '/lib' + _libdir = re.sub('-(sdk|devel)', '', _sdkdir) if os.path.exists(_libdir + '/libmozjs.so'): addpath('LD_LIBRARY_PATH', _libdir)