]> git.lyx.org Git - lyx.git/commitdiff
Fix the fix, qt 4.2 still uses QTDIR/lib to store .pc files
authorBo Peng <bpeng@lyx.org>
Mon, 26 May 2008 17:22:42 +0000 (17:22 +0000)
committerBo Peng <bpeng@lyx.org>
Mon, 26 May 2008 17:22:42 +0000 (17:22 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24946 a592a061-630c-0410-9148-cb99ea01b6c8

development/scons/qt4.py

index 47a93ca013d2983059f44fe351dbc05a8d3ae210..c140992f4c895a27250e35ae7403fb3d4c4513e6 100644 (file)
@@ -352,9 +352,9 @@ 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/pkgconfig pkg-config %s --libs --cflags'%
+               self.ParseConfig('PKG_CONFIG_PATH=%s/lib:%s/lib/pkgconfig pkg-config %s --libs --cflags'%
                (
-                       self['QTDIR'],
+                       self['QTDIR'], self['QTDIR'],
                        ' '.join(modules)))
                return
        if sys.platform == "win32" :