Fix ticket #2882 (not using QGIS_LIB_SUBDIR to determine pathname to the

qgis library directory for linux builds) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13912 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 12, 2010 · 894639f · 894639f
1 parent 2004f26
commit 894639f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -23,6 +23,7 @@
 #define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
 #define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}"
 #define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
+#define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"
 
 #cmakedefine HAVE_POSTGRESQL
 

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4931,8 +4931,10 @@ void QgisApp::showPluginManager()
 void QgisApp::loadPythonSupport()
 {
   QString pythonlibName( "qgispython" );
-#if defined(Q_WS_MAC) || defined(Q_OS_LINUX)
+#if defined(Q_WS_MAC)
   pythonlibName.prepend( QgsApplication::prefixPath() + "/lib/" );
+#elif defined(Q_OS_LINUX)
+  pythonlibName.prepend( QgsApplication::prefixPath() + "/" + QGIS_LIB_SUBDIR + "/" );
 #endif
 #ifdef __MINGW32__
   pythonlibName.prepend( "lib" );