build fixes
authorapg <apg@76c9efe7-43af-4aca-a270-d8da3bf5252a>
Tue, 16 Feb 2010 17:34:51 +0000 (17:34 +0000)
committerapg <apg@76c9efe7-43af-4aca-a270-d8da3bf5252a>
Tue, 16 Feb 2010 17:34:51 +0000 (17:34 +0000)
git-svn-id: svn://oss.syntext.com/oss/serna-free/trunk@277 76c9efe7-43af-4aca-a270-d8da3bf5252a

3rd/qt/qt-defaults.pro

index b0c18a0..f68f98c 100644 (file)
@@ -45,6 +45,8 @@ unix:PACKAGE_CFG_OPTIONS *=     \
 PACKAGE_CFG_ENV     = QMAKESPEC=$(QMAKESPEC) QTPREFIX=$(QTPREFIX)
                                 
 QT_ASSISTANT_CUSTOM_IMAGES = qt/icons/assistant
+unix:PACKAGE_MAKE_ENV = LD_LIBRARY_PATH=$(QTDIR)/lib
+darwin:PACKAGE_MAKE_ENV = DYLD_LIBRARY_PATH=$(QTDIR)/lib
 
 PACKAGE_TARGET  = \
                sub-moc-make_default-ordered \
@@ -79,7 +81,7 @@ win32:PACKAGE_TARGET  = \
                sub-tools-make_default-ordered \
                 qm-qt
                  
-#unix:PACKAGE_MAKEOPTS = -j3
+unix:PACKAGE_MAKEOPTS = -j3
 INSTALL_ENV_VARS += QMAKESPEC
 
 BASENAME            = qt-all-opensource-src-$$VERSION