From d207d3f3d5171c0d8cb62c3c85cc89c24027c97b Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Thu, 25 Sep 2014 16:12:03 +0000 Subject: [PATCH] Fix local user manual on Mac. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4367 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 2 ++ Configuration.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 171cb1f01..4831d33d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,8 @@ endif (WIN32) if (APPLE) set (WSJT_BIN_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/MacOS) set (WSJT_SHARE_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources) + set (WSJT_MANPAGE_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources) + set (WSJT_DOC_DESTINATION doc) set (WSJT_PLUGIN_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/PlugIns) set (WSJT_QT_CONF_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources) endif (APPLE) diff --git a/Configuration.cpp b/Configuration.cpp index d59e98060..e9f13b752 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -605,6 +605,10 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS if (path.isEmpty ()) { doc_path_.cdUp (); +#if defined (Q_OS_MAC) + doc_path_.cdUp (); + doc_path_.cdUp (); +#endif doc_path_.cd (WSJT_SHARE_DESTINATION); doc_path_.cd (WSJT_DOC_DESTINATION); } @@ -613,7 +617,7 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS doc_path_.cd (path); } #else - doc_path.cd (WSJT_DOC_DESTINATION); + doc_path_.cd (WSJT_DOC_DESTINATION); #endif #if WSJT_STANDARD_FILE_LOCATIONS