[QGIS Commit] r13930 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: gjm
Date: 2010-07-18 12:06:52 +0000 (Sun, 18 Jul 2010)
New Revision: 13930

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
Implement suggestion in #2882 (make the Mac build use the configurable
directory for the lib install directory - rather than the hard-coded
'lib').


Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-07-18 12:03:00 UTC (rev 13929)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-07-18 12:06:52 UTC (rev 13930)
@@ -4931,9 +4931,7 @@
 void QgisApp::loadPythonSupport()
 {
   QString pythonlibName( "qgispython" );
-#if defined(Q_WS_MAC)
-  pythonlibName.prepend( QgsApplication::prefixPath() + "/lib/" );
-#elif defined(Q_OS_LINUX)
+#if defined(Q_WS_MAC) || defined(Q_OS_LINUX)
   pythonlibName.prepend( QgsApplication::prefixPath() + "/" + QGIS_LIB_SUBDIR + "/" );
 #endif
 #ifdef __MINGW32__