QGIS » QGIS Application

Index: src/app/qgisapp.cpp

===================================================================

--- src/app/qgisapp.cpp	(revision 13910)

+++ src/app/qgisapp.cpp	(working copy)

@@ -4931,8 +4931,10 @@

 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( QGIS_LIB_SUBDIR );

 #endif

 #ifdef __MINGW32__

   pythonlibName.prepend( "lib" );

Index: cmake_templates/qgsconfig.h.in

===================================================================

--- cmake_templates/qgsconfig.h.in	(revision 13910)

+++ cmake_templates/qgsconfig.h.in	(working copy)

@@ -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