From d7c279bd09676508d1ac49e8200262a9391daf1d Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Mon, 26 May 2008 17:00:11 +0000 Subject: [PATCH] Fix scons qt4 pkg_config detection when there are multiple copies of Qt around git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24945 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/qt4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/scons/qt4.py b/development/scons/qt4.py index b303842ca7..47a93ca013 100644 --- a/development/scons/qt4.py +++ b/development/scons/qt4.py @@ -352,7 +352,7 @@ def enable_modules(self, modules, debug=False) : self.AppendUnique(LIBPATH=[os.path.join(self["QTDIR"],"lib",module)]) self.AppendUnique(CPPPATH=[os.path.join(self["QTDIR"],"include","qt4",module)]) modules.remove(module) - self.ParseConfig('PKG_CONFIG_PATH=%s/lib pkg-config %s --libs --cflags'% + self.ParseConfig('PKG_CONFIG_PATH=%s/lib/pkgconfig pkg-config %s --libs --cflags'% ( self['QTDIR'], ' '.join(modules)))