Skip to content

Commit

Permalink
Tweak documentation, install docs & licenses
Browse files Browse the repository at this point in the history
  • Loading branch information
AMDmi3 committed Dec 21, 2015
1 parent 8c90e0e commit ee3871c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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})
Expand Down
15 changes: 9 additions & 6 deletions COPYING.DATA
Original file line number Diff line number Diff line change
@@ -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
<amdmi3@amdmi3.ru> 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
<xkcd@xkcd.com> and are licensed under a Creative Commons
Attribution-NonCommercial 2.5 License:

http://xkcd.com/license.html

0 comments on commit ee3871c

Please sign in to comment.