From 85c2903db4ecc83206cbd6e9d07112dc6c9d949e Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Tue, 8 Dec 2015 21:10:19 +0000
Subject: [PATCH] Another attempt to get installed locations right

That is, right for all platforms with both local and package installs.
Install copyright and Debian change log in correct package directory.

Merged from ^/branches/wsjtx.



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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9511cfc68..f2ecbb218 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,8 +151,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)
@@ -168,8 +168,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)
@@ -1033,13 +1033,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/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 1b5f072d2..8a2727356 100644
--- a/debian/CMakeLists.txt
+++ b/debian/CMakeLists.txt
@@ -34,6 +34,6 @@ configure_file (
 install (FILES
   ${CMAKE_CURRENT_BINARY_DIR}/${deb_changelog}.gz
   ${CMAKE_CURRENT_BINARY_DIR}/copyright
-  DESTINATION ${WSJT_DOC_DESTINATION}
+  DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DOC_DESTINATION}
   #COMPONENT Debian
   )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7217d5a98..7320deb9a 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -146,7 +146,7 @@ add_custom_target (docs ALL DEPENDS ${user_guide})
 
 install (FILES
   ${user_guide}
-  DESTINATION ${WSJT_DOC_DESTINATION}
+  DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DOC_DESTINATION}
   RENAME ${PROJECT_MANUAL}
   #COMPONENT runtime
   )