From c5ea6938d3aeccff4662ac8d7f7e40de13d6a08f Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Tue, 8 Dec 2015 20:39:50 +0000
Subject: [PATCH] Another attempt to get installed locations right

That is, right for all platforms with both local and package installs.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6248 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 CMakeLists.txt     | 12 ++++++------
 doc/CMakeLists.txt |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6e10b800..a5de2a761 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,8 +144,8 @@ message (STATUS "******************************************************")
 set (BIN_DESTINATION bin)
 set (LIB_DESTINATION lib)
 set (SHARE_DESTINATION share)
-set (DOC_DESTINATION ${SHARE_DESTINATION}/doc/${CMAKE_PROJECT_NAME})
-set (DATA_DESTINATION ${SHARE_DESTINATION}/${CMAKE_PROJECT_NAME})
+set (DOC_DESTINATION doc/${CMAKE_PROJECT_NAME})
+set (DATA_DESTINATION ${CMAKE_PROJECT_NAME})
 set (MANPAGE_DESTINATION ${SHARE_DESTINATION})
 set (PLUGIN_DESTINATION lib/plugins)
 set (QT_CONF_DESTINATION bin)
@@ -161,8 +161,8 @@ if (APPLE)
   set (BIN_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/MacOS)
   set (SHARE_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources)
   set (MANPAGE_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources)
-  set (DOC_DESTINATION ${SHARE_DESTINATION}/doc)
-  set (DATA_DESTINATION ${SHARE_DESTINATION}/data)
+  set (DOC_DESTINATION doc)
+  set (DATA_DESTINATION data)
   set (PLUGIN_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/PlugIns)
   set (QT_CONF_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources)
 endif (APPLE)
@@ -1051,13 +1051,13 @@ install (FILES
   NEWS
   INSTALL
   BUGS
-  DESTINATION ${WSJT_DOC_DESTINATION}
+  DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DOC_DESTINATION}
   #COMPONENT runtime
   )
 
 install (FILES
   contrib/Ephemeris/JPLEPH
-  DESTINATION ${WSJT_DATA_DESTINATION}
+  DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DATA_DESTINATION}
   #COMPONENT runtime
   )
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 8d3417e44..b8e3df790 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -181,7 +181,7 @@ add_custom_target (docs ALL DEPENDS ${html} ${pdf})
 
 install (FILES
   ${html}
-  DESTINATION ${WSJT_DOC_DESTINATION}
+  DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DOC_DESTINATION}
   RENAME ${PROJECT_MANUAL}
   #COMPONENT runtime
   )