Correct fix for #849. Use actual installation directory, not just default directory.

wonder · wonder · commit 46be62520ee9 · 2008-04-03T21:47:15.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8316 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/plugins/mapserver_export/CMakeLists.txt b/python/plugins/mapserver_export/CMakeLists.txt
@@ -10,4 +10,4 @@ resources.py
 ui_mapserverexport.py
 )
 
-INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${DEFAULT_DATA_SUBDIR}/python/plugins/mapserver_export)
+INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/mapserver_export)
diff --git a/python/plugins/plugin_installer/CMakeLists.txt b/python/plugins/plugin_installer/CMakeLists.txt
@@ -11,4 +11,4 @@ resources.py
 repository_ui.py
 repository_dialog.py
 )
-INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${DEFAULT_DATA_SUBDIR}/python/plugins/plugin_installer)
+INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/plugin_installer)

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ resources.py`
`10`	`10`	`ui_mapserverexport.py`
`11`	`11`	`)`
`12`	`12`
`13`		`-INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${DEFAULT_DATA_SUBDIR}/python/plugins/mapserver_export)`
	`13`	`+INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/mapserver_export)`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ resources.py`
`11`	`11`	`repository_ui.py`
`12`	`12`	`repository_dialog.py`
`13`	`13`	`)`
`14`		`-INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${DEFAULT_DATA_SUBDIR}/python/plugins/plugin_installer)`
	`14`	`+INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/plugin_installer)`