Skip to content
Permalink
Browse files

move qgis_help to libexec

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15294 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Feb 28, 2011
1 parent e7dbc5a commit 094a75e1bb42401b2550e2bad688e2f8fc137666
Showing with 3 additions and 16 deletions.
  1. +0 −15 qgis_help.1
  2. +1 −1 src/helpviewer/CMakeLists.txt
  3. +2 −0 src/helpviewer/main.cpp

This file was deleted.

@@ -103,5 +103,5 @@ IF (APPLE)
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)
@@ -44,6 +44,8 @@ int main( int argc, char ** argv )
#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();

0 comments on commit 094a75e

Please sign in to comment.
You can’t perform that action at this time.