1 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
2 index 5e8fa25..8304a0c 100644
3 --- a/doc/CMakeLists.txt
4 +++ b/doc/CMakeLists.txt
5 @@ -14,11 +14,10 @@ add_custom_target(progdoc COMMENT "create program documentation files")
7 message(STATUS "can create man page")
9 - set(DOC_MAN ${CMAKE_CURRENT_BINARY_DIR}/simulavr.1.gz)
10 + set(DOC_MAN ${CMAKE_CURRENT_BINARY_DIR}/simulavr.1)
12 add_custom_command(OUTPUT ${DOC_MAN}
13 - COMMAND ${HELP2MAN} -o ${CMAKE_CURRENT_BINARY_DIR}/simulavr.1 "$<TARGET_FILE:simulavr>"
14 - COMMAND ${GZIP} -n9 ${CMAKE_CURRENT_BINARY_DIR}/simulavr.1)
15 + COMMAND ${HELP2MAN} -o ${CMAKE_CURRENT_BINARY_DIR}/simulavr.1 "$<TARGET_FILE:simulavr>")
16 add_custom_target(doc-man DEPENDS ${DOC_MAN})
17 add_dependencies(progdoc doc-man)
19 @@ -36,11 +35,10 @@ endif()
21 message(STATUS "can create info page")
23 - set(DOC_INFO ${CMAKE_CURRENT_BINARY_DIR}/simulavr.info.gz)
24 + set(DOC_INFO ${CMAKE_CURRENT_BINARY_DIR}/simulavr.info)
26 add_custom_command(OUTPUT ${DOC_INFO}
27 - COMMAND ${MAKEINFO} ${CMAKE_CURRENT_BINARY_DIR}/simulavr.texi
28 - COMMAND ${GZIP} -n9 ${CMAKE_CURRENT_BINARY_DIR}/simulavr.info)
29 + COMMAND ${MAKEINFO} ${CMAKE_CURRENT_BINARY_DIR}/simulavr.texi)
30 add_custom_target(doc-info DEPENDS ${DOC_INFO})
31 add_dependencies(progdoc doc-info)
33 @@ -56,14 +54,12 @@ else()
37 - set(DOC_CHANGELOG ${CMAKE_CURRENT_BINARY_DIR}/changelog.gz)
38 + set(DOC_CHANGELOG ${CMAKE_CURRENT_BINARY_DIR}/changelog)
40 - add_custom_command(OUTPUT ${DOC_CHANGELOG}
41 - COMMAND ${GZIP} -n9 ${CMAKE_CURRENT_BINARY_DIR}/changelog)
42 add_custom_target(doc-changelog DEPENDS ${DOC_CHANGELOG})
43 add_dependencies(progdoc doc-changelog)
45 - install(FILES ${DOC_CHANGELOG} DESTINATION "share/doc/common")
46 + install(FILES ${DOC_CHANGELOG} DESTINATION "share/doc/simulavr-${PACKAGE_VERSION}")
49 add_custom_target(doc COMMENT "create simulavr documentation" DEPENDS progdoc)
50 diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
51 index 8c2f7c0..c23b06f 100644
52 --- a/app/CMakeLists.txt
53 +++ b/app/CMakeLists.txt
54 @@ -21,6 +21,6 @@ set(docSrcs ${docDir}/AUTHORS
58 -install(FILES ${docSrcs} DESTINATION "share/doc/common")
59 +install(FILES ${docSrcs} DESTINATION "share/doc/simulavr-${PACKAGE_VERSION}")
62 diff --git a/libsim/CMakeLists.txt b/libsim/CMakeLists.txt
63 index c50f050..6175124 100644
64 --- a/libsim/CMakeLists.txt
65 +++ b/libsim/CMakeLists.txt
66 @@ -41,13 +41,13 @@ file(GLOB files_ui "${CMAKE_SOURCE_DIR}/include/ui/*.h")
67 file(GLOB files_cmd "${CMAKE_SOURCE_DIR}/include/cmd/*.h")
68 file(GLOB files_elfio "${CMAKE_SOURCE_DIR}/include/elfio/elfio/*.hpp")
70 -install(TARGETS sim DESTINATION "lib")
71 -install(FILES ${files_common} DESTINATION "include")
72 -install(FILES ${files_hwtimer} DESTINATION "include/hwtimer")
73 -install(FILES ${files_gdb} DESTINATION "include/gdb")
74 -install(FILES ${files_ui} DESTINATION "include/ui")
75 -install(FILES ${files_cmd} DESTINATION "include/cmd")
76 -install(FILES ${files_elfio} DESTINATION "include/elfio/elfio")
77 +install(TARGETS sim LIBRARY)
78 +install(FILES ${files_common} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/")
79 +install(FILES ${files_hwtimer} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hwtimer")
80 +install(FILES ${files_gdb} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gdb")
81 +install(FILES ${files_ui} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ui")
82 +install(FILES ${files_cmd} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cmd")
83 +install(FILES ${files_elfio} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/elfio/elfio")