From ee3871cbec74d91e66f8171652c5192841a39dd3 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 21 Dec 2015 18:26:22 +0300 Subject: [PATCH] Tweak documentation, install docs & licenses --- CMakeLists.txt | 4 ++++ COPYING.DATA | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea28ed0..26062dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,11 +12,13 @@ IF(SYSTEMWIDE) SET(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Root directory for data files") SET(DATADIR "${DATAROOTDIR}/hoverboard" CACHE STRING "Where to install data files") SET(DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Where to install .desktop file") + SET(DOCSDIR "${DATAROOTDIR}/doc/hoverboard" CACHE STRING "Where to install documentation") ELSEIF(STANDALONE) SET(BINDIR "." CACHE STRING "Where to install binaries") SET(DATAROOTDIR "." CACHE STRING "Root directory for data files") SET(DATADIR "data" CACHE STRING "Where to install data files") SET(DESKTOPDIR "." CACHE STRING "Where to install .desktop file") + SET(DOCSDIR "." CACHE STRING "Where to install documentation") ENDIF(SYSTEMWIDE) # flags @@ -79,6 +81,8 @@ IF(SYSTEMWIDE OR STANDALONE) INSTALL(TARGETS hoverboard RUNTIME DESTINATION ${BINDIR}) INSTALL(DIRECTORY data/ DESTINATION ${DATADIR}) + INSTALL(FILES README.md COPYING COPYING.DATA DESTINATION ${DOCSDIR}) + IF(NOT WIN32) CONFIGURE_FILE(misc/hoverboard.desktop.in misc/hoverboard.desktop) INSTALL(FILES ${PROJECT_BINARY_DIR}/misc/hoverboard.desktop DESTINATION ${DESKTOPDIR}) diff --git a/COPYING.DATA b/COPYING.DATA index c124d2c..a29af82 100644 --- a/COPYING.DATA +++ b/COPYING.DATA @@ -1,7 +1,10 @@ -datasrc/* and data/map_icons.png are (C) Dmitry Marakasov and are -licensed under Creative Commons Attribution 4.0 license. +map_icons.svg and map_icons.png were created by Dmitry Marakasov + and are licensed under Creative Commons Attribution +4.0 license. -All other files in data/ directory were either obtained from -https://xkcd.com/1608/ or derived from data obtained from there, -are (C) Randall Munroe and are licensed under a Creative Commons -Attribution-NonCommercial 2.5 License. +All other data files were either obtained from https://xkcd.com/1608/ +or derived from such files, were created by Randall Munroe + and are licensed under a Creative Commons +Attribution-NonCommercial 2.5 License: + + http://xkcd.com/license.html