From b7de032022e329396d37b78728511801fe7de518 Mon Sep 17 00:00:00 2001
From: Klaus Schneider-Zapp <klaus_snd@web.de>
Date: Tue, 9 Jul 2019 16:04:17 +0200
Subject: [PATCH] Fix debian package

Some files were not installed into the correct directories as specified by the
Debian standard.

Signed-off-by: Klaus Schneider-Zapp <klaus_snd@web.de>
---
 CMakeLists.txt     | 10 ++++++----
 doc/CMakeLists.txt |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9817ff1f..8ba57e25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,9 @@ SET(PAHO_BUILD_DEB_PACKAGE FALSE CACHE BOOL "Build debian package")
 SET(PAHO_ENABLE_TESTING TRUE CACHE BOOL "Build tests and run")
 SET(PAHO_ENABLE_CPACK TRUE CACHE BOOL "Enable CPack")
 
+IF(PAHO_BUILD_DEB_PACKAGE)
+    set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt)
+ENDIF()
 
 ADD_SUBDIRECTORY(src)
 IF(PAHO_BUILD_SAMPLES)
@@ -64,16 +67,16 @@ ENDIF()
 IF (PAHO_ENABLE_CPACK)
        ### packaging settings
        FILE(GLOB samples "src/samples/*.c")
-       INSTALL(FILES ${samples} DESTINATION samples)
+       INSTALL(FILES ${samples} DESTINATION ${CMAKE_INSTALL_DOCDIR}/samples)
 
        SET(CPACK_PACKAGE_VENDOR "Eclipse Paho")
        SET(CPACK_PACKAGE_NAME "Eclipse-Paho-MQTT-C")
-       INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
+       INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
        IF (WIN32)
                SET(CPACK_GENERATOR "ZIP")
        ELSEIF(PAHO_BUILD_DEB_PACKAGE)
-               INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
+               INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
                SET(CPACK_GENERATOR "DEB")
                CONFIGURE_FILE(${CMAKE_SCRIPTS}/CPackDebConfig.cmake.in
@@ -86,7 +89,6 @@ IF (PAHO_ENABLE_CPACK)
 ELSE()
        FILE(GLOB samples "src/samples/*.c")
        INSTALL(FILES ${samples} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
 ENDIF()
 
 SET(CPACK_PACKAGE_VERSION_MAJOR ${PAHO_VERSION_MAJOR})
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f15f3143..ee5b6eb3 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -39,7 +39,7 @@ ENDFOREACH(DOXYFILE_SRC)
 
 ADD_CUSTOM_TARGET(doc ALL DEPENDS ${DOXYTARGETS})
 IF (PAHO_ENABLE_CPACK)
-    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share)
+    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR})
 ELSE()
     INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION ${CMAKE_INSTALL_DOCDIR})
-ENDIF()
\ No newline at end of file
+ENDIF()