]> git.lyx.org Git - lyx.git/commitdiff
Fix scons qt4 pkg_config detection when there are multiple copies of Qt around
authorBo Peng <bpeng@lyx.org>
Mon, 26 May 2008 17:00:11 +0000 (17:00 +0000)
committerBo Peng <bpeng@lyx.org>
Mon, 26 May 2008 17:00:11 +0000 (17:00 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24945 a592a061-630c-0410-9148-cb99ea01b6c8

development/scons/qt4.py

index b303842ca774e70fc855e484d67617336d277e11..47a93ca013d2983059f44fe351dbc05a8d3ae210 100644 (file)
@@ -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)))