[QGIS Commit] r15294 - in trunk/qgis: . src/helpviewer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Feb 28 18:07:53 EST 2011
Author: jef
Date: 2011-02-28 15:07:53 -0800 (Mon, 28 Feb 2011)
New Revision: 15294
Removed:
trunk/qgis/qgis_help.1
Modified:
trunk/qgis/src/helpviewer/CMakeLists.txt
trunk/qgis/src/helpviewer/main.cpp
Log:
move qgis_help to libexec
Deleted: trunk/qgis/qgis_help.1
===================================================================
--- trunk/qgis/qgis_help.1 2011-02-28 23:06:46 UTC (rev 15293)
+++ trunk/qgis/qgis_help.1 2011-02-28 23:07:53 UTC (rev 15294)
@@ -1,15 +0,0 @@
-.TH QGIS_HELP 1 "April 13, 2008"
-.SH NAME
-qgis_help \- help viewer for qgis, the geographic data viewer
-.SH SYNOPSIS
-.B qgis_help [helpfile]
-.br
-.SH DESCRIPTION
-.B qgis_help
-is internally used by
-.B qgis
-to view help files.
-.SH SEE ALSO
-qgis(1)
-.SH AUTHOR
-This manual page was written by J\[:u]rgen Fischer <jef at norbit.de>.
Modified: trunk/qgis/src/helpviewer/CMakeLists.txt
===================================================================
--- trunk/qgis/src/helpviewer/CMakeLists.txt 2011-02-28 23:06:46 UTC (rev 15293)
+++ trunk/qgis/src/helpviewer/CMakeLists.txt 2011-02-28 23:07:53 UTC (rev 15294)
@@ -103,5 +103,5 @@
INSTALL (CODE "EXECUTE_PROCESS(COMMAND install_name_tool -change ${CMAKE_INSTALL_NAME_DIR}/libqgis_core.${COMPLETE_VERSION}.dylib @executable_path/../../../../lib/libqgis_core.${COMPLETE_VERSION}.dylib \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/MacOS/qgis_help\")")
INSTALL (CODE "EXECUTE_PROCESS (COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/Frameworks\")")
ELSE (APPLE)
- INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
+ INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})
ENDIF (APPLE)
Modified: trunk/qgis/src/helpviewer/main.cpp
===================================================================
--- trunk/qgis/src/helpviewer/main.cpp 2011-02-28 23:06:46 UTC (rev 15293)
+++ trunk/qgis/src/helpviewer/main.cpp 2011-02-28 23:07:53 UTC (rev 15294)
@@ -44,6 +44,8 @@
#ifdef Q_WS_MACX
// If we're on Mac, we have the resource library way above us...
a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
+#else
+ a.setPkgDataPath( QgsApplication::prefixPath() + "/../" QGIS_DATA_SUBDIR );
#endif
QString i18nPath = QgsApplication::i18nPath();
More information about the QGIS-commit
mailing list