TR1: move TR1 check to config.h / buildsystem

[lyx.git] / development / scons / qt4.py

diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index 47a93ca013d2983059f44fe351dbc05a8d3ae210..c140992f4c895a27250e35ae7403fb3d4c4513e6 100644 (file)
--- a/development/scons/qt4.py
+++ b/development/scons/qt4.py
@@ -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" :